diff options
| author | Nicholas Mc Guire <der.herr@hofr.at> | 2015-01-20 06:25:43 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-01-23 21:33:42 +0200 |
| commit | 5b4c6b4f0b2778351c5bef74888a5fbdfbdd0ef5 (patch) | |
| tree | d4192dc46318109852402964ec2753c715d70e32 /drivers/net | |
| parent | c0719334bf0b4d72fc0d22c484c698eec2a95c6d (diff) | |
| download | linux-5b4c6b4f0b2778351c5bef74888a5fbdfbdd0ef5.tar.gz linux-5b4c6b4f0b2778351c5bef74888a5fbdfbdd0ef5.tar.bz2 linux-5b4c6b4f0b2778351c5bef74888a5fbdfbdd0ef5.zip | |
p54: add handling of the signal case
if(!wait_for_completion_interruptible_timeout(...))
only handles the timeout case - this patch adds handling the
signal case the same as timeout.
Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Acked-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/p54/fwio.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c index bc065e8e348b..5367d510b22d 100644 --- a/drivers/net/wireless/p54/fwio.c +++ b/drivers/net/wireless/p54/fwio.c @@ -220,6 +220,7 @@ int p54_download_eeprom(struct p54_common *priv, void *buf, struct sk_buff *skb; size_t eeprom_hdr_size; int ret = 0; + long timeout; if (priv->fw_var >= 0x509) eeprom_hdr_size = sizeof(*eeprom_hdr); @@ -249,9 +250,11 @@ int p54_download_eeprom(struct p54_common *priv, void *buf, p54_tx(priv, skb); - if (!wait_for_completion_interruptible_timeout( - &priv->eeprom_comp, HZ)) { - wiphy_err(priv->hw->wiphy, "device does not respond!\n"); + timeout = wait_for_completion_interruptible_timeout( + &priv->eeprom_comp, HZ); + if (timeout <= 0) { + wiphy_err(priv->hw->wiphy, + "device does not respond or signal received!\n"); ret = -EBUSY; } priv->eeprom = NULL; |