From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 Feb 2010 01:22:53 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: Ubuntu-5.0.0-8.9~24187
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=06a79b82b2a3e4bebb9a20638ca208c780e9e507;p=mirror_ubuntu-disco-kernel.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Hibernate: Fix preallocating of memory
  PM / Hibernate: Remove swsusp.c finally
  PM / Hibernate: Remove trailing space in message
  PM: Allow SCSI devices to suspend/resume asynchronously
  PM: Allow USB devices to suspend/resume asynchronously
  USB: implement non-tree resume ordering constraints for PCI host controllers
  PM: Allow PCI devices to suspend/resume asynchronously
  PM / Hibernate: Swap, remove useless check from swsusp_read()
  PM / Hibernate: Really deprecate deprecated user ioctls
  PM: Allow device drivers to use dpm_wait()
  PM: Start asynchronous resume threads upfront
  PM: Add facility for advanced testing of async suspend/resume
  PM: Add a switch for disabling/enabling asynchronous suspend/resume
  PM: Asynchronous suspend and resume of devices
  PM: Add parent information to timing messages
  PM: Document device power attributes in sysfs
  PM / Runtime: Add sysfs switch for disabling device run-time PM
---

06a79b82b2a3e4bebb9a20638ca208c780e9e507
diff --cc drivers/scsi/scsi_sysfs.c
index a4936c4e2f46,c5580805a359..19ec9e2d3f39
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@@ -890,8 -892,9 +893,9 @@@ int scsi_sysfs_add_sdev(struct scsi_dev
  	error = device_add(&sdev->sdev_gendev);
  	if (error) {
  		printk(KERN_INFO "error 1\n");
 -		goto out_remove;
 +		return error;
  	}
+ 	device_enable_async_suspend(&sdev->sdev_dev);
  	error = device_add(&sdev->sdev_dev);
  	if (error) {
  		printk(KERN_INFO "error 2\n");