summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-scsi.c
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2011-12-05 02:20:28 +0100
committerJeff Garzik <jgarzik@redhat.com>2012-01-09 01:14:58 +0100
commit9ee4f3933930abf5cc34f8e9d69fe0e08c18f602 (patch)
tree7d3751d52712f71a19d488f9970b6184b4c140c6 /drivers/ata/libata-scsi.c
parentata: add ata port system PM callbacks (diff)
downloadlinux-9ee4f3933930abf5cc34f8e9d69fe0e08c18f602.tar.xz
linux-9ee4f3933930abf5cc34f8e9d69fe0e08c18f602.zip
ata: add ata port runtime PM callbacks
Add ata port runtime suspend/resume/idle callbacks. Set ->eh_noresume to skip the runtime PM calls on scsi host in the error handler to avoid dead lock. Acked-by: Tejun Heo <tj@kernel.org> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata-scsi.c')
-rw-r--r--drivers/ata/libata-scsi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 7ae1e771d950..508a60bfe5c1 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3381,6 +3381,7 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)
if (!shost)
goto err_alloc;
+ shost->eh_noresume = 1;
*(struct ata_port **)&shost->hostdata[0] = ap;
ap->scsi_host = shost;