Commit 152af05c authored by Jeff Garzik's avatar Jeff Garzik

Merge branch 'dipm-fix' into upstream-fixes

parents 17bd9a2f f5456b63
...@@ -676,10 +676,11 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy) ...@@ -676,10 +676,11 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy)
if (rc) if (rc)
return rc; return rc;
/* disable DIPM */ /*
if (ata_dev_enabled(dev) && (dev->flags & ATA_DFLAG_DIPM)) * we don't have to disable DIPM since IPM flags
err_mask = ata_dev_set_feature(dev, * disallow transitions to SLUMBER, which effectively
SETFEATURES_SATA_DISABLE, SATA_DIPM); * disable DIPM if it does not support PARTIAL
*/
break; break;
case NOT_AVAILABLE: case NOT_AVAILABLE:
case MAX_PERFORMANCE: case MAX_PERFORMANCE:
...@@ -689,10 +690,11 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy) ...@@ -689,10 +690,11 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy)
if (rc) if (rc)
return rc; return rc;
/* disable DIPM */ /*
if (ata_dev_enabled(dev) && (dev->flags & ATA_DFLAG_DIPM)) * we don't have to disable DIPM since IPM flags
err_mask = ata_dev_set_feature(dev, * disallow all transitions which effectively
SETFEATURES_SATA_DISABLE, SATA_DIPM); * disable DIPM anyway.
*/
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment