diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-02 01:19:05 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-02 01:19:05 +0300 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /drivers/scsi/hosts.c | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
| download | linux-d702d12167a2c05a346f49aac7a311d597762495.tar.xz | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'drivers/scsi/hosts.c')
| -rw-r--r-- | drivers/scsi/hosts.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 554626e18062..09dbcb847b73 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -215,6 +215,8 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, shost->shost_gendev.parent = dev ? dev : &platform_bus; shost->dma_dev = dma_dev; + device_enable_async_suspend(&shost->shost_gendev); + error = device_add(&shost->shost_gendev); if (error) goto out; @@ -222,6 +224,8 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, scsi_host_set_state(shost, SHOST_RUNNING); get_device(shost->shost_gendev.parent); + device_enable_async_suspend(&shost->shost_dev); + error = device_add(&shost->shost_dev); if (error) goto out_del_gendev; |