X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fbase%2Fcore.c;h=7f59c2f2ebcba6fd8236f32235a9e1c9df00c35b;hb=135dee0cd0eb2638fab899b428e51f00e8c046a8;hp=9c0070b5bd3e75d828a44d405dca4695b70e6ef6;hpb=9853832c49dc1685587abeb4e1decd4be690d256;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 9c0070b5bd3..7f59c2f2ebc 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -770,13 +770,6 @@ int device_add(struct device *dev)
 	struct class_interface *class_intf;
 	int error;
 
-	error = pm_sleep_lock();
-	if (error) {
-		dev_warn(dev, "Suspicious %s during suspend\n", __FUNCTION__);
-		dump_stack();
-		return error;
-	}
-
 	dev = get_device(dev);
 	if (!dev || !strlen(dev->bus_id)) {
 		error = -EINVAL;
@@ -843,11 +836,9 @@ int device_add(struct device *dev)
 	}
  Done:
 	put_device(dev);
-	pm_sleep_unlock();
 	return error;
  BusError:
 	device_pm_remove(dev);
-	dpm_sysfs_remove(dev);
  PMError:
 	if (dev->bus)
 		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,