p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: rtl8192u: propagate errors in write_nic_word 

Propagate errors from kzalloc and usb_control_msg and change the
return type of write_nic_word 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:47 +01:00 committed by Greg Kroah-Hartman
parent 6ae4e4b302
commit 28d653d7d1
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

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

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

@ -329,7 +329,7 @@ int write_nic_byte(struct net_device *dev, int indx, u8 data)
}
void write_nic_word(struct net_device *dev, int indx, u16 data)
int write_nic_word(struct net_device *dev, int indx, u16 data)
{
int status;
@ -338,7 +338,7 @@ void write_nic_word(struct net_device *dev, int indx, u16 data)
u16 *usbdata = kzalloc(sizeof(data), GFP_KERNEL);
if (!usbdata)
return;
return -ENOMEM;
*usbdata = data;
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
@ -347,8 +347,12 @@ void write_nic_word(struct net_device *dev, int indx, u16 data)
usbdata, 2, HZ / 2);
kfree(usbdata);
if (status < 0)
if (status < 0) {
netdev_err(dev, "write_nic_word TimeOut! status: %d\n", status);
return status;
}
return 0;
}