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

Commit 9f6bd36c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: fix oops when LPM is used with PMP
parents 05bf86b4 5f6f12cc

drivers/ata/libata-eh.c

+1 −1
Original line number Diff line number Diff line
@@ -3316,7 +3316,7 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, 
	struct ata_eh_context *ehc = &link->eh_context;

	struct ata_device *dev, *link_dev = NULL, *lpm_dev = NULL;

	enum ata_lpm_policy old_policy = link->lpm_policy;

	bool no_dipm = ap->flags & ATA_FLAG_NO_DIPM;

	bool no_dipm = link->ap->flags & ATA_FLAG_NO_DIPM;

	unsigned int hints = ATA_LPM_EMPTY | ATA_LPM_HIPM;

	unsigned int err_mask;

	int rc;