redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: wilc1000: return kernel error codes from wilc_wlan_stop 

return -EIO for bus failures, 0 otherwise.

Signed-off-by: Adham Abozaeid <adham.abozaeid@microchip.com>
Link: https://lore.kernel.org/r/20190809182510.22443-3-adham.abozaeid@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
alistair/sunxi64-5.4-dsi
Adham Abozaeid 2019-08-09 18:25:19 +00:00 committed by Greg Kroah-Hartman
parent 0d1b57c1f0
commit 133716f4ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/wilc1000/wilc_wlan.c
View File

@ -979,7 +979,7 @@ int wilc_wlan_stop(struct wilc *wilc, struct wilc_vif *vif)
if (!ret) { if (!ret) {
netdev_err(vif->ndev, "Error while reading reg\n"); netdev_err(vif->ndev, "Error while reading reg\n");
release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP); release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
return ret; return -EIO;
} }
ret = wilc->hif_func->hif_write_reg(wilc, WILC_GP_REG_0, ret = wilc->hif_func->hif_write_reg(wilc, WILC_GP_REG_0,
@ -987,14 +987,14 @@ int wilc_wlan_stop(struct wilc *wilc, struct wilc_vif *vif)
if (!ret) { if (!ret) {
netdev_err(vif->ndev, "Error while writing reg\n"); netdev_err(vif->ndev, "Error while writing reg\n");
release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP); release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
return ret; return -EIO;
} }
ret = wilc->hif_func->hif_read_reg(wilc, WILC_FW_HOST_COMM, &reg); ret = wilc->hif_func->hif_read_reg(wilc, WILC_FW_HOST_COMM, &reg);
if (!ret) { if (!ret) {
netdev_err(vif->ndev, "Error while reading reg\n"); netdev_err(vif->ndev, "Error while reading reg\n");
release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP); release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
return ret; return -EIO;
} }
reg = BIT(0); reg = BIT(0);
@ -1002,12 +1002,12 @@ int wilc_wlan_stop(struct wilc *wilc, struct wilc_vif *vif)
if (!ret) { if (!ret) {
netdev_err(vif->ndev, "Error while writing reg\n"); netdev_err(vif->ndev, "Error while writing reg\n");
release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP); release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
return ret; return -EIO;
} }
release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP); release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
return ret; return 0;
} }
void wilc_wlan_cleanup(struct net_device *dev) void wilc_wlan_cleanup(struct net_device *dev)