Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5456b63 authored by Kristen Carlson Accardi's avatar Kristen Carlson Accardi Committed by Jeff Garzik
Browse files

libata: Don't disable dipm with SET FEATURES 



LPM seems to get hung up while disabling DIPM, and after thinking
about this a bit, I don't think we really need to manually disable it
anyway.

Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b55d1b18

drivers/ata/libata-core.c

+10 −8
Original line number Original line Diff line number Diff line
@@ -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) 
		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;

	}

	}