Skip to content

Commit

Permalink
wlcore: don't set SDIO_FAILED flag when driver state is off
Browse files Browse the repository at this point in the history
If some IO read/write fails while the FW is not loaded, a recovery
will not take place. This means the SDIO_FAILED flag will stay in place
forever and prevent further read/writes.

This can happen if a check for STATE_OFF was forgotten in some routine.

Take this opportunity to rename the flag to IO_FAILED, since we support
other buses as well.

Reported-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
  • Loading branch information
Arik Nemtsov authored and John W. Linville committed Jul 10, 2012
1 parent c45ee4f commit 4455556
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions drivers/net/wireless/ti/wlcore/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ static inline int __must_check wlcore_raw_write(struct wl1271 *wl, int addr,
{
int ret;

if (test_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags))
if (test_bit(WL1271_FLAG_IO_FAILED, &wl->flags))
return -EIO;

ret = wl->if_ops->write(wl->dev, addr, buf, len, fixed);
if (ret)
set_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags);
if (ret && wl->state != WL1271_STATE_OFF)
set_bit(WL1271_FLAG_IO_FAILED, &wl->flags);

return ret;
}
Expand All @@ -76,12 +76,12 @@ static inline int __must_check wlcore_raw_read(struct wl1271 *wl, int addr,
{
int ret;

if (test_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags))
if (test_bit(WL1271_FLAG_IO_FAILED, &wl->flags))
return -EIO;

ret = wl->if_ops->read(wl->dev, addr, buf, len, fixed);
if (ret)
set_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags);
if (ret && wl->state != WL1271_STATE_OFF)
set_bit(WL1271_FLAG_IO_FAILED, &wl->flags);

return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ti/wlcore/wlcore_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ enum wl12xx_flags {
WL1271_FLAG_RECOVERY_IN_PROGRESS,
WL1271_FLAG_VIF_CHANGE_IN_PROGRESS,
WL1271_FLAG_INTENDED_FW_RECOVERY,
WL1271_FLAG_SDIO_FAILED,
WL1271_FLAG_IO_FAILED,
};

enum wl12xx_vif_flags {
Expand Down

0 comments on commit 4455556

Please sign in to comment.