Skip to content

Commit

Permalink
staging/winbond: use err and remove nr
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Devendra Naga authored and Greg Kroah-Hartman committed Jul 17, 2012
1 parent 2390e83 commit 6594ac5
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/staging/winbond/wbusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 6594ac5

Please sign in to comment.