---

yaml
---
r: 220007
b: refs/heads/master
c: e104960
h: refs/heads/master
i:
  220005: 27af308
  220003: 0ffa98c
  219999: 79be604
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53059aa05988761a738fa8bc082bbf3c5d4462d1
+refs/heads/master: e10496041bd8ef75772d6adbbd7029ca023dc66e

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;
 }