1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index d3e2c5f90a26..b3f779f5933a 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -274,6 +274,9 @@ static void usbatm_complete(struct urb *urb)
                         (!(channel->usbatm->flags & UDSL_IGNORE_EILSEQ) ||
                          urb->status != -EILSEQ ))
         {
+                if (urb->status == -ESHUTDOWN)
+                        return;
+
                 if (printk_ratelimit())
                         atm_warn(channel->usbatm, "%s: urb 0x%p failed (%d)!\n",
                                 __func__, urb, urb->status);
@@ -968,6 +971,14 @@ static int usbatm_atm_init(struct usbatm_data *instance)
         /* temp init ATM device, set to 128kbit */
         atm_dev->link_rate = 128 * 1000 / 424;
 
+        ret = sysfs_create_link(&atm_dev->class_dev.kobj,
+                                &instance->usb_intf->dev.kobj, "device");
+        if (ret) {
+                atm_err(instance, "%s: sysfs_create_link failed: %d\n",
+                                        __func__, ret);
+                goto fail_sysfs;
+        }
+
         if (instance->driver->atm_start && ((ret = instance->driver->atm_start(instance, atm_dev)) < 0)) {
                 atm_err(instance, "%s: atm_start failed: %d!\n", __func__, ret);
                 goto fail;
@@ -986,6 +997,8 @@ static int usbatm_atm_init(struct usbatm_data *instance)
         return 0;
 
  fail:
+        sysfs_remove_link(&atm_dev->class_dev.kobj, "device");
+ fail_sysfs:
         instance->atm_dev = NULL;
         atm_dev_deregister(atm_dev); /* usbatm_atm_dev_close will eventually be called */
         return ret;
@@ -1318,8 +1331,10 @@ void usbatm_usb_disconnect(struct usb_interface *intf)
         kfree(instance->cell_buf);
 
         /* ATM finalize */
-        if (instance->atm_dev)
+        if (instance->atm_dev) {
+                sysfs_remove_link(&instance->atm_dev->class_dev.kobj, "device");
                 atm_dev_deregister(instance->atm_dev);
+        }
 
         usbatm_put_instance(instance);  /* taken in usbatm_usb_probe */
 }