diff --git a/[refs] b/[refs]
index 036aac5ed56c..d156277408de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c656bbb582cebd988d8c39c4912722dc47578eab
+refs/heads/master: c88a768d7ed1bc38eedf18d16419ef2f01cd2d0d
diff --git a/trunk/drivers/net/wireless/p54/p54usb.c b/trunk/drivers/net/wireless/p54/p54usb.c
index 44d6855bd17c..9539ddcf379f 100644
--- a/trunk/drivers/net/wireless/p54/p54usb.c
+++ b/trunk/drivers/net/wireless/p54/p54usb.c
@@ -430,14 +430,16 @@ static const char p54u_firmware_upload_3887[] = "<\r";
 static int p54u_device_reset_3887(struct ieee80211_hw *dev)
 {
 	struct p54u_priv *priv = dev->priv;
-	int ret, lock;
+	int ret, lock = (priv->intf->condition != USB_INTERFACE_BINDING);
 	u8 buf[4];
 
-	ret = lock = usb_lock_device_for_reset(priv->udev, priv->intf);
-	if (ret < 0) {
-		dev_err(&priv->udev->dev, "(p54usb) unable to lock device for "
-			"reset: %d\n", ret);
-		return ret;
+	if (lock) {
+		ret = usb_lock_device_for_reset(priv->udev, priv->intf);
+		if (ret < 0) {
+			dev_err(&priv->udev->dev, "(p54usb) unable to lock "
+				" device for reset: %d\n", ret);
+			return ret;
+		}
 	}
 
 	ret = usb_reset_device(priv->udev);