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

Commit 52e02f27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata fixes from Tejun Heo:
 "Three libata fixes: an error handling fix, blacklist addition for
  another fallout from upping the default max sectors, and fix for a
  sense data reporting bug which affects new harddrives which can report
  sense data"

* 'for-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ata: sata_mv:- Handle return value of devm_ioremap.
  libata: Fix ATA request sense
  libata: apply MAX_SEC_1024 to all CX1-JB*-HP devices
parents c9194b99 064c3db9

drivers/ata/libata-core.c

+4 −2
Original line number Diff line number Diff line
@@ -1702,6 +1702,8 @@ unsigned ata_exec_internal_sg(struct ata_device *dev, 


		if (qc->err_mask & ~AC_ERR_OTHER)

			qc->err_mask &= ~AC_ERR_OTHER;

	} else if (qc->tf.command == ATA_CMD_REQ_SENSE_DATA) {

		qc->result_tf.command |= ATA_SENSE;

	}



	/* finish up */
@@ -4356,10 +4358,10 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ "ST380013AS",		"3.20",		ATA_HORKAGE_MAX_SEC_1024 },



	/*

	 * Device times out with higher max sects.

	 * These devices time out with higher max sects.

	 * https://bugzilla.kernel.org/show_bug.cgi?id=121671

	 */

	{ "LITEON CX1-JB256-HP", NULL,		ATA_HORKAGE_MAX_SEC_1024 },

	{ "LITEON CX1-JB*-HP",	NULL,		ATA_HORKAGE_MAX_SEC_1024 },



	/* Devices we expect to fail diagnostics */

drivers/ata/sata_mv.c

+3 −0
Original line number Diff line number Diff line
@@ -4132,6 +4132,9 @@ static int mv_platform_probe(struct platform_device *pdev) 
	host->iomap = NULL;

	hpriv->base = devm_ioremap(&pdev->dev, res->start,

				   resource_size(res));

	if (!hpriv->base)

		return -ENOMEM;



	hpriv->base -= SATAHC0_REG_BASE;



	hpriv->clk = clk_get(&pdev->dev, NULL);