From cf9ab10bde6bd508a170b328537fa357570e32ef Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Fri, 31 Mar 2006 11:52:25 -0500
Subject: [PATCH] --- yaml --- r: 25761 b: refs/heads/master c:
 0f836ca4c122f4ef096110d652a6326fe34e6961 h: refs/heads/master i:   25759:
 d50c085042294c83d28f5645ead88fd76b2c3a42 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/base/dd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ded6e2da764c..fa6855c2d1b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4508a7a734b111b8b7e39986237d84acb1168dd0
+refs/heads/master: 0f836ca4c122f4ef096110d652a6326fe34e6961
diff --git a/trunk/drivers/base/dd.c b/trunk/drivers/base/dd.c
index 730a9ce0a14a..889c71111239 100644
--- a/trunk/drivers/base/dd.c
+++ b/trunk/drivers/base/dd.c
@@ -209,7 +209,7 @@ static void __device_release_driver(struct device * dev)
 		sysfs_remove_link(&dev->kobj, "driver");
 		klist_remove(&dev->knode_driver);
 
-		if (dev->bus->remove)
+		if (dev->bus && dev->bus->remove)
 			dev->bus->remove(dev);
 		else if (drv->remove)
 			drv->remove(dev);