[PATCH 2/9] staging: rtl8192u: eprom_read: check return value of eprom_r
Salah Triki
salah.triki at acm.org
Mon Mar 14 03:08:12 UTC 2016
Check the return value from eprom_r and propagate it in the case of error.
The error code is a negative value, therefore change the return type of
eprom_read from u32 to int.
Signed-off-by: Salah Triki <salah.triki at acm.org>
---
drivers/staging/rtl8192u/r8180_93cx6.c | 9 +++++++--
drivers/staging/rtl8192u/r8180_93cx6.h | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8180_93cx6.c b/drivers/staging/rtl8192u/r8180_93cx6.c
index da68b67..9ee30a0 100644
--- a/drivers/staging/rtl8192u/r8180_93cx6.c
+++ b/drivers/staging/rtl8192u/r8180_93cx6.c
@@ -106,7 +106,7 @@ static void eprom_send_bits_string(struct net_device *dev, short b[], int len)
}
-u32 eprom_read(struct net_device *dev, u32 addr)
+int eprom_read(struct net_device *dev, u32 addr)
{
struct r8192_priv *priv = ieee80211_priv(dev);
short read_cmd[] = {1, 1, 0};
@@ -114,6 +114,7 @@ u32 eprom_read(struct net_device *dev, u32 addr)
int i;
int addr_len;
u32 ret;
+ int err;
/* enable EPROM programming */
write_nic_byte_E(dev, EPROM_CMD,
@@ -156,7 +157,11 @@ u32 eprom_read(struct net_device *dev, u32 addr)
* and reading data. (eeprom outs a dummy 0)
*/
eprom_ck_cycle(dev);
- ret |= (eprom_r(dev) << (15 - i));
+ err = eprom_r(dev);
+ if (err)
+ return err;
+
+ ret |= err<<(15-i);
}
eprom_cs(dev, 0);
diff --git a/drivers/staging/rtl8192u/r8180_93cx6.h b/drivers/staging/rtl8192u/r8180_93cx6.h
index b840348..9cf7f58 100644
--- a/drivers/staging/rtl8192u/r8180_93cx6.h
+++ b/drivers/staging/rtl8192u/r8180_93cx6.h
@@ -40,4 +40,4 @@
#define EPROM_TXPW1 0x3d
-u32 eprom_read(struct net_device *dev, u32 addr); /* reads a 16 bits word */
+int eprom_read(struct net_device *dev, u32 addr); /* reads a 16 bits word */
--
1.9.1
More information about the devel
mailing list