renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

staging: rtl8192u: propagate errors in eprom_read

Browse Source 
Propagate error from eprom_r and change the return type of eprom_read
from u32 to int.

Signed-off-by: Salah Triki <salah.triki@acm.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Salah Triki 2016-05-04 04:42:41 +01:00 committed by Greg Kroah-Hartman
parent 2fe9262e7e
commit 6ceb65b837
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/rtl8192u/r8180_93cx6.c
View File

@ -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;
ret = 0;
/* enable EPROM programming */
@ -157,7 +158,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 < 0)
return err;
ret |= err<<(15-i);
}
eprom_cs(dev, 0);

2
drivers/staging/rtl8192u/r8180_93cx6.h
View File

@ -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 */