2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 02c52f8d5dbf..a73e714288e5 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -456,7 +456,6 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
                                  int* actual_length)
 {
         struct timer_list timer;
-        int status = urb->status;
 
         init_timer(&timer);
         timer.expires = jiffies + msecs_to_jiffies(CMD_TIMEOUT);
@@ -468,7 +467,7 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
 
         if (actual_length)
                 *actual_length = urb->actual_length;
-        return status;
+        return urb->status; /* must read status after completion */
 }
 
 static int cxacru_cm(struct cxacru_data *instance, enum cxacru_cm_request cm,
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index a1a1c9d467e0..29807d048b04 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -1721,9 +1721,12 @@ static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
 
         ret = uea_boot(sc);
         if (ret < 0)
-                goto error;
+                goto error_rm_grp;
 
         return 0;
+
+error_rm_grp:
+        sysfs_remove_group(&intf->dev.kobj, &attr_grp);
 error:
         kfree(sc);
         return ret;