[PATCH] driver core: properly get driver in device_release_driver

[PATCH] driver core: properly get driver in device_release_driver

[Stefan Richter]

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
 drivers/base/dd.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: linux-2.6.22-rc3/drivers/base/dd.c
===================================================================
--- linux-2.6.22-rc3.orig/drivers/base/dd.c
+++ linux-2.6.22-rc3/drivers/base/dd.c
@@ -309,9 +309,8 @@ static void __device_release_driver(stru
 {
 	struct device_driver * drv;
 
-	drv = dev->driver;
+	drv = get_driver(dev->driver);
 	if (drv) {
-		get_driver(drv);
 		driver_sysfs_remove(dev);
 		sysfs_remove_link(&dev->kobj, "driver");
 		klist_remove(&dev->knode_driver);

-- 
Stefan Richter
-=====-=-=== -==- =---=
http://arcgraph.de/sr/

[PATCH] driver core: fix kernel doc of device_release_driver

[Stefan Richter]

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
 drivers/base/dd.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Index: linux-2.6.22-rc3/drivers/base/dd.c
===================================================================
--- linux-2.6.22-rc3.orig/drivers/base/dd.c
+++ linux-2.6.22-rc3/drivers/base/dd.c
@@ -294,17 +294,10 @@ int driver_attach(struct device_driver *
 	return bus_for_each_dev(drv->bus, NULL, drv, __driver_attach);
 }
 
-/**
- *	device_release_driver - manually detach device from driver.
- *	@dev:	device.
- *
- *	Manually detach device from driver.
- *
+/*
  *	__device_release_driver() must be called with @dev->sem held.
- *	When called for a USB interface, @dev->parent->sem must be held
- *	as well.
+ *	When called for a USB interface, @dev->parent->sem must be held as well.
  */
-
 static void __device_release_driver(struct device * dev)
 {
 	struct device_driver * drv;
@@ -330,6 +323,13 @@ static void __device_release_driver(stru
 	}
 }
 
+/**
+ *	device_release_driver - manually detach device from driver.
+ *	@dev:	device.
+ *
+ *	Manually detach device from driver.
+ *	When called for a USB interface, @dev->parent->sem must be held.
+ */
 void device_release_driver(struct device * dev)
 {
 	/*

-- 
Stefan Richter
-=====-=-=== -==- =---=
http://arcgraph.de/sr/