diff options
| author | Tejun Heo <tj@kernel.org> | 2017-01-09 07:38:25 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2017-01-09 07:38:25 -0500 |
| commit | 0fe4618d3b22d0ae44a4e650526466cf570ff8a5 (patch) | |
| tree | 0c692cacd3431642945df7f4163aefca63ede012 /drivers/ata | |
| parent | 88af4bbd8f6983378c3098ca3e26c4e48434fe69 (diff) | |
| parent | 064c3db9c564cc5be514ac21fb4aa26cc33db746 (diff) | |
| download | linux-0fe4618d3b22d0ae44a4e650526466cf570ff8a5.tar.gz linux-0fe4618d3b22d0ae44a4e650526466cf570ff8a5.tar.bz2 linux-0fe4618d3b22d0ae44a4e650526466cf570ff8a5.zip | |
Merge branch 'for-4.10-fixes' into for-4.11
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-core.c | 6 | ||||
| -rw-r--r-- | drivers/ata/sata_mv.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index dc70b5f997f1..ca75823697dd 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -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 */ diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index bcbfe23a45f6..6eed4a72d328 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -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); |