From 6a7313aacdf9b777e572c5fdc9765473adaab466 Mon Sep 17 00:00:00 2001
From: Daniel Ritz <daniel.ritz@gmx.ch>
Date: Thu, 22 Sep 2005 00:47:24 -0700
Subject: [PATCH] --- yaml --- r: 9191 b: refs/heads/master c:
 d305ef5d2a4e77bfa66160513f4a7494126a506b h: refs/heads/master i:   9189:
 160f9e5e5c51e8f340822e218562dca41db5396d   9187:
 d3a34a79ed4a46dadf181ff1a223b35e328620bb   9183:
 2521a9efcaffb080486e304072783d7e440a348e v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/s390/cio/ccwgroup.c | 2 +-
 trunk/drivers/usb/core/message.c  | 2 +-
 trunk/drivers/usb/core/usb.c      | 6 +++---
 trunk/include/linux/device.h      | 5 +++++
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ca7a3847b093..7de6a3230a37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c898c7f2f286b204fefc5dddb568f755d195d0c
+refs/heads/master: d305ef5d2a4e77bfa66160513f4a7494126a506b
diff --git a/trunk/drivers/s390/cio/ccwgroup.c b/trunk/drivers/s390/cio/ccwgroup.c
index 91ea8e4777f3..dbb3eb0e330b 100644
--- a/trunk/drivers/s390/cio/ccwgroup.c
+++ b/trunk/drivers/s390/cio/ccwgroup.c
@@ -437,7 +437,7 @@ __ccwgroup_get_gdev_by_cdev(struct ccw_device *cdev)
 	if (cdev->dev.driver_data) {
 		gdev = (struct ccwgroup_device *)cdev->dev.driver_data;
 		if (get_device(&gdev->dev)) {
-			if (klist_node_attached(&gdev->dev.knode_bus))
+			if (device_is_registered(&gdev->dev))
 				return gdev;
 			put_device(&gdev->dev);
 		}
diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c
index c47c8052b486..f1fb67fe22a8 100644
--- a/trunk/drivers/usb/core/message.c
+++ b/trunk/drivers/usb/core/message.c
@@ -987,7 +987,7 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0)
 
 			/* remove this interface if it has been registered */
 			interface = dev->actconfig->interface[i];
-			if (!klist_node_attached(&interface->dev.knode_bus))
+			if (!device_is_registered(&interface->dev))
 				continue;
 			dev_dbg (&dev->dev, "unregistering interface %s\n",
 				interface->dev.bus_id);
diff --git a/trunk/drivers/usb/core/usb.c b/trunk/drivers/usb/core/usb.c
index 087af73a59dd..7d131509e419 100644
--- a/trunk/drivers/usb/core/usb.c
+++ b/trunk/drivers/usb/core/usb.c
@@ -303,7 +303,7 @@ int usb_driver_claim_interface(struct usb_driver *driver,
 	/* if interface was already added, bind now; else let
 	 * the future device_add() bind it, bypassing probe()
 	 */
-	if (klist_node_attached(&dev->knode_bus))
+	if (device_is_registered(dev))
 		device_bind_driver(dev);
 
 	return 0;
@@ -336,8 +336,8 @@ void usb_driver_release_interface(struct usb_driver *driver,
 	if (iface->condition != USB_INTERFACE_BOUND)
 		return;
 
-	/* release only after device_add() */
-	if (klist_node_attached(&dev->knode_bus)) {
+	/* don't release if the interface hasn't been added yet */
+	if (device_is_registered(dev)) {
 		iface->condition = USB_INTERFACE_UNBINDING;
 		device_release_driver(dev);
 	}
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
index 06e5d42f2c7b..95d607a48f06 100644
--- a/trunk/include/linux/device.h
+++ b/trunk/include/linux/device.h
@@ -317,6 +317,11 @@ dev_set_drvdata (struct device *dev, void *data)
 	dev->driver_data = data;
 }
 
+static inline int device_is_registered(struct device *dev)
+{
+	return klist_node_attached(&dev->knode_bus);
+}
+
 /*
  * High level routines for use by the bus drivers
  */