brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8192u: propagate errors in write_nic_dword 

Propagate errors from kzalloc and usb_control_msg and change the
return type of write_nic_dword from void 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:48 +01:00 committed by Greg Kroah-Hartman
parent 28d653d7d1
commit ec06d48f24
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1132,7 +1132,7 @@ 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_E(struct net_device *dev, int x, u8 y);
int write_nic_word(struct net_device *dev, int x, u16 y);
void write_nic_dword(struct net_device *dev, int x, u32 y);
int write_nic_dword(struct net_device *dev, int x, u32 y);
void force_pci_posting(struct net_device *dev);
void rtl8192_rtx_disable(struct net_device *);

10
drivers/staging/rtl8192u/r8192U_core.c
View File

@ -356,7 +356,7 @@ int write_nic_word(struct net_device *dev, int indx, u16 data)
}
void write_nic_dword(struct net_device *dev, int indx, u32 data)
int write_nic_dword(struct net_device *dev, int indx, u32 data)
{
int status;
@ -365,7 +365,7 @@ void write_nic_dword(struct net_device *dev, int indx, u32 data)
u32 *usbdata = kzalloc(sizeof(data), GFP_KERNEL);
if (!usbdata)
return;
return -ENOMEM;
*usbdata = data;
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
@ -375,9 +375,13 @@ void write_nic_dword(struct net_device *dev, int indx, u32 data)
kfree(usbdata);
if (status < 0)
if (status < 0) {
netdev_err(dev, "write_nic_dword TimeOut! status: %d\n",
status);
return status;
}
return 0;
}