redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging/winbond: use err and remove nr

Browse source 
err can be used get return status of the  usb_control_msg, rather using
nr and assigning it to err when the function returns error.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Devendra Naga 2012-07-14 13:25:37 +05:45 committed by Greg Kroah-Hartman
parent 2390e83439
commit 6594ac5dea
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/winbond/wbusb.c
View file

@ -747,20 +747,18 @@ static int wb35_probe(struct usb_interface *intf,
struct usb_host_interface *interface;
struct ieee80211_hw *dev;
struct wbsoft_priv *priv;
int nr, err;
int err;
u32 ltmp;
usb_get_dev(udev);
/* Check the device if it already be opened */
nr = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
err = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
0x01,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
0x0, 0x400, &ltmp, 4, HZ * 100);
if (nr < 0) {
err = nr;
if (err < 0)
goto error;
}
/* Is already initialized? */
ltmp = cpu_to_le32(ltmp);