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

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

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

drivers/staging/rtl8192u/r8192U.h

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

drivers/staging/rtl8192u/r8192U_core.c

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

}