2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/usb/wusbcore/mmc.c b/drivers/usb/wusbcore/mmc.c
index 44741267c917..3f485df96226 100644
--- a/drivers/usb/wusbcore/mmc.c
+++ b/drivers/usb/wusbcore/mmc.c
@@ -301,7 +301,7 @@ int wusbhc_chid_set(struct wusbhc *wusbhc, const struct wusb_ckhdid *chid)
 
         if (chid)
                 result = uwb_radio_start(&wusbhc->pal);
-        else
+        else if (wusbhc->uwb_rc)
                 uwb_radio_stop(&wusbhc->pal);
 
         return result;
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index c8e2a47d62a7..3e2e4ed20157 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -2390,10 +2390,10 @@ error_complete:
                 done) {
 
                 dev_info(dev, "Control EP stall.  Queue delayed work.\n");
-                spin_lock_irq(&wa->xfer_list_lock);
+                spin_lock(&wa->xfer_list_lock);
                 /* move xfer from xfer_list to xfer_errored_list. */
                 list_move_tail(&xfer->list_node, &wa->xfer_errored_list);
-                spin_unlock_irq(&wa->xfer_list_lock);
+                spin_unlock(&wa->xfer_list_lock);
                 spin_unlock_irqrestore(&xfer->lock, flags);
                 queue_work(wusbd, &wa->xfer_error_work);
         } else {