Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 288842
b: refs/heads/master
c: cef9bc5
h: refs/heads/master
v: v3
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Jan 25, 2012
1 parent f5b8004 commit 2e64ae9
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fde25a9b63b9a3dc91365c394a426ebe64cfc2da
refs/heads/master: cef9bc56e1e944afd11f96de569657117a138c6d
6 changes: 1 addition & 5 deletions trunk/drivers/hid/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1619,11 +1619,7 @@ static ssize_t store_new_id(struct device_driver *drv, const char *buf,
list_add_tail(&dynid->list, &hdrv->dyn_list);
spin_unlock(&hdrv->dyn_lock);

ret = 0;
if (get_driver(&hdrv->driver)) {
ret = driver_attach(&hdrv->driver);
put_driver(&hdrv->driver);
}
ret = driver_attach(&hdrv->driver);

return ret ? : count;
}
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/pci/pci-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ int pci_add_dynid(struct pci_driver *drv,
list_add_tail(&dynid->node, &drv->dynids.list);
spin_unlock(&drv->dynids.lock);

get_driver(&drv->driver);
retval = driver_attach(&drv->driver);
put_driver(&drv->driver);

return retval;
}
Expand Down
5 changes: 1 addition & 4 deletions trunk/drivers/pcmcia/ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,7 @@ pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count)
list_add_tail(&dynid->node, &pdrv->dynids.list);
mutex_unlock(&pdrv->dynids.lock);

if (get_driver(&pdrv->drv)) {
retval = driver_attach(&pdrv->drv);
put_driver(&pdrv->drv);
}
retval = driver_attach(&pdrv->drv);

if (retval)
return retval;
Expand Down
5 changes: 1 addition & 4 deletions trunk/drivers/usb/core/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,7 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
list_add_tail(&dynid->node, &dynids->list);
spin_unlock(&dynids->lock);

if (get_driver(driver)) {
retval = driver_attach(driver);
put_driver(driver);
}
retval = driver_attach(driver);

if (retval)
return retval;
Expand Down

0 comments on commit 2e64ae9

Please sign in to comment.