From fc719af56a08dc1208d75498952d9f8bb407de14 Mon Sep 17 00:00:00 2001 From: Al Cho Date: Fri, 24 Sep 2010 18:50:11 +0800 Subject: [PATCH] --- yaml --- r: 220007 b: refs/heads/master c: e10496041bd8ef75772d6adbbd7029ca023dc66e h: refs/heads/master i: 220005: 27af3084d97478396a1f720c6d3bd28ebb7782c1 220003: 0ffa98c06abf603b42a7b8a15dea1c9c20c2b831 219999: 79be604815d654a172888ec76b414f4d885d56b9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/keucr/transport.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 126e92d66b63..71edb0f700e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53059aa05988761a738fa8bc082bbf3c5d4462d1 +refs/heads/master: e10496041bd8ef75772d6adbbd7029ca023dc66e diff --git a/trunk/drivers/staging/keucr/transport.c b/trunk/drivers/staging/keucr/transport.c index 7215429759bc..445a62ce6931 100644 --- a/trunk/drivers/staging/keucr/transport.c +++ b/trunk/drivers/staging/keucr/transport.c @@ -763,24 +763,19 @@ int usb_stor_port_reset(struct us_data *us) int result, rc_lock; //printk("transport --- usb_stor_port_reset\n"); - result = rc_lock = usb_lock_device_for_reset(us->pusb_dev, us->pusb_intf); + result = usb_lock_device_for_reset(us->pusb_dev, us->pusb_intf); if (result < 0) printk("unable to lock device for reset: %d\n", result); - else - { + else { /* Were we disconnected while waiting for the lock? */ - if (test_bit(US_FLIDX_DISCONNECTING, &us->dflags)) - { + if (test_bit(US_FLIDX_DISCONNECTING, &us->dflags)) { result = -EIO; //printk("No reset during disconnect\n"); - } - else - { + } else { result = usb_reset_device(us->pusb_dev); //printk("usb_reset_composite_device returns %d\n", result); } - if (rc_lock) - usb_unlock_device(us->pusb_dev); + usb_unlock_device(us->pusb_dev); } return result; }