Driver class: remove possible oops

This happens when the device associated with a class device goes away before the class does.

Driver class: remove possible oops
This happens when the device associated with a class device goes away before the class does.
667de9e8 · Greg Kroah-Hartman · 6746ea4d · 667de9e8
Commit 667de9e8 authored Mar 18, 2004 by Greg Kroah-Hartman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

drivers/base/class.c drivers/base/class.c +2 -4

No files found.
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -155,8 +155,7 @@ static int class_device_dev_link(struct class_device * class_dev)
 static void class_device_dev_unlink(struct class_device * class_dev)
 {
-	if (class_dev->dev)
+	sysfs_remove_link(&class_dev->kobj, "device");
-		sysfs_remove_link(&class_dev->kobj, "device");
 }
 static int class_device_driver_link(struct class_device * class_dev)
@@ -169,8 +168,7 @@ static int class_device_driver_link(struct class_device * class_dev)
 static void class_device_driver_unlink(struct class_device * class_dev)
 {
-	if ((class_dev->dev) && (class_dev->dev->driver))
+	sysfs_remove_link(&class_dev->kobj, "driver");
-		sysfs_remove_link(&class_dev->kobj, "driver");
 }