Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec06d48f authored by Salah Triki's avatar Salah Triki Committed by Greg Kroah-Hartman
Browse files

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: default avatarSalah Triki <salah.triki@acm.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28d653d7

drivers/staging/rtl8192u/r8192U.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

drivers/staging/rtl8192u/r8192U_core.c

+7 −3
Original line number Diff line number Diff line
@@ -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;

}