Commit 6ae4e4b3 authored by Salah Triki's avatar Salah Triki Committed by Greg Kroah-Hartman

staging: rtl8192u: propagate errors in write_nic_byte_E

Propagate errors from  kzalloc and usb_control_msg and change the
return type of write_nic_byte_E from void to int.
Signed-off-by: default avatarSalah Triki <salah.triki@acm.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba15f657
...@@ -1130,7 +1130,7 @@ int read_nic_byte_E(struct net_device *dev, int x, u8 *data); ...@@ -1130,7 +1130,7 @@ int read_nic_byte_E(struct net_device *dev, int x, u8 *data);
int read_nic_dword(struct net_device *dev, int x, u32 *data); int read_nic_dword(struct net_device *dev, int x, u32 *data);
int read_nic_word(struct net_device *dev, int x, u16 *data); int read_nic_word(struct net_device *dev, int x, u16 *data);
int write_nic_byte(struct net_device *dev, int x, u8 y); int write_nic_byte(struct net_device *dev, int x, u8 y);
void write_nic_byte_E(struct net_device *dev, int x, u8 y); int write_nic_byte_E(struct net_device *dev, int x, u8 y);
void write_nic_word(struct net_device *dev, int x, u16 y); void write_nic_word(struct net_device *dev, int x, u16 y);
void write_nic_dword(struct net_device *dev, int x, u32 y); void write_nic_dword(struct net_device *dev, int x, u32 y);
void force_pci_posting(struct net_device *dev); void force_pci_posting(struct net_device *dev);
......
...@@ -253,7 +253,7 @@ u32 read_cam(struct net_device *dev, u8 addr) ...@@ -253,7 +253,7 @@ u32 read_cam(struct net_device *dev, u8 addr)
return data; return data;
} }
void write_nic_byte_E(struct net_device *dev, int indx, u8 data) int write_nic_byte_E(struct net_device *dev, int indx, u8 data)
{ {
int status; int status;
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
...@@ -261,7 +261,7 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8 data) ...@@ -261,7 +261,7 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8 data)
u8 *usbdata = kzalloc(sizeof(data), GFP_KERNEL); u8 *usbdata = kzalloc(sizeof(data), GFP_KERNEL);
if (!usbdata) if (!usbdata)
return; return -ENOMEM;
*usbdata = data; *usbdata = data;
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
...@@ -269,9 +269,12 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8 data) ...@@ -269,9 +269,12 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8 data)
indx | 0xfe00, 0, usbdata, 1, HZ / 2); indx | 0xfe00, 0, usbdata, 1, HZ / 2);
kfree(usbdata); kfree(usbdata);
if (status < 0) if (status < 0){
netdev_err(dev, "write_nic_byte_E TimeOut! status: %d\n", netdev_err(dev, "write_nic_byte_E TimeOut! status: %d\n",
status); status);
return status;
}
return 0;
} }
int read_nic_byte_E(struct net_device *dev, int indx, u8 *data) int read_nic_byte_E(struct net_device *dev, int indx, u8 *data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment