Commit 9cf9707e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] USB: i was wrong, clean up some extra refcounts that are no longer needed.

parent 9e155521
...@@ -922,10 +922,6 @@ void usb_disconnect(struct usb_device **pdev) ...@@ -922,10 +922,6 @@ void usb_disconnect(struct usb_device **pdev)
} }
up(&dev->serialize); up(&dev->serialize);
device_unregister(&dev->dev); device_unregister(&dev->dev);
/* Decrement the reference count, it'll auto free everything when */
/* it hits 0 which could very well be now */
usb_put_dev(dev);
} }
/** /**
...@@ -1009,7 +1005,6 @@ int usb_new_device(struct usb_device *dev, struct device *parent) ...@@ -1009,7 +1005,6 @@ int usb_new_device(struct usb_device *dev, struct device *parent)
dev->dev.driver = &usb_generic_driver; dev->dev.driver = &usb_generic_driver;
dev->dev.bus = &usb_bus_type; dev->dev.bus = &usb_bus_type;
dev->dev.driver_data = &usb_generic_driver_data; dev->dev.driver_data = &usb_generic_driver_data;
usb_get_dev(dev);
if (dev->dev.bus_id[0] == 0) if (dev->dev.bus_id[0] == 0)
sprintf (&dev->dev.bus_id[0], "%d-%s", sprintf (&dev->dev.bus_id[0], "%d-%s",
dev->bus->busnum, dev->devpath); dev->bus->busnum, dev->devpath);
...@@ -1135,7 +1130,6 @@ int usb_new_device(struct usb_device *dev, struct device *parent) ...@@ -1135,7 +1130,6 @@ int usb_new_device(struct usb_device *dev, struct device *parent)
dev->state = USB_STATE_DEFAULT; dev->state = USB_STATE_DEFAULT;
clear_bit(dev->devnum, dev->bus->devmap.devicemap); clear_bit(dev->devnum, dev->bus->devmap.devicemap);
dev->devnum = -1; dev->devnum = -1;
usb_put_dev(dev);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment