From 06858edc422c143cac55eec6a9cdf9d1951fabde Mon Sep 17 00:00:00 2001 From: Aaron Lu Date: Tue, 15 Jan 2013 17:21:04 +0800 Subject: [PATCH] --- yaml --- r: 356951 b: refs/heads/master c: 7e15e9be37eb834aaaca69030064ac97eaf5df2f h: refs/heads/master i: 356949: 7b81676e4c14881a4920f2d82fbe490b44f24662 356947: 13d94ec9f5071d0969467d9e99faaff15d8b452a 356943: 1bb12f353c18d9cae32287d164a0ecaceee64a19 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 31f0d7ba79d1..569fd06936bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a59b9aae230316134597775c6202cf28f6da0333 +refs/heads/master: 7e15e9be37eb834aaaca69030064ac97eaf5df2f diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index c7ecd8492f1e..b7eed827daae 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -5413,8 +5413,27 @@ static int ata_port_resume(struct device *dev) return rc; } +/* + * For ODDs, the upper layer will poll for media change every few seconds, + * which will make it enter and leave suspend state every few seconds. And + * as each suspend will cause a hard/soft reset, the gain of runtime suspend + * is very little and the ODD may malfunction after constantly being reset. + * So the idle callback here will not proceed to suspend if a non-ZPODD capable + * ODD is attached to the port. + */ static int ata_port_runtime_idle(struct device *dev) { + struct ata_port *ap = to_ata_port(dev); + struct ata_link *link; + struct ata_device *adev; + + ata_for_each_link(link, ap, HOST_FIRST) { + ata_for_each_dev(adev, link, ENABLED) + if (adev->class == ATA_DEV_ATAPI && + !zpodd_dev_enabled(adev)) + return -EBUSY; + } + return pm_runtime_suspend(dev); }