From 1dacd811c1a4547a79dae047d6c521835933d4b7 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sat, 14 Jul 2012 13:25:37 +0545 Subject: [PATCH] --- yaml --- r: 318008 b: refs/heads/master c: 6594ac5dead7ad7cd10103d147eda3190fd49cad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/winbond/wbusb.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 33613495c30e..f39b971738ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2390e83439f533cf2eaf506087e4efb6cf92d91f +refs/heads/master: 6594ac5dead7ad7cd10103d147eda3190fd49cad diff --git a/trunk/drivers/staging/winbond/wbusb.c b/trunk/drivers/staging/winbond/wbusb.c index c3751a718384..ef360547ecec 100644 --- a/trunk/drivers/staging/winbond/wbusb.c +++ b/trunk/drivers/staging/winbond/wbusb.c @@ -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, <mp, 4, HZ * 100); - if (nr < 0) { - err = nr; + if (err < 0) goto error; - } /* Is already initialized? */ ltmp = cpu_to_le32(ltmp);