diff options
| author | Tejun Heo | 2015-08-03 17:41:33 +0200 |
|---|---|---|
| committer | Tejun Heo | 2015-08-03 17:41:33 +0200 |
| commit | fe16d4f202c59a560533a223bc6375739ee30944 (patch) | |
| tree | 56bb840c5826263d17373d9b1bcbbbcccd8173b2 /drivers/ata/libata-core.c | |
| parent | ata: ahci_brcmstb: Fix warnings with CONFIG_PM_SLEEP=n (diff) | |
| download | kernel-qcow2-linux-fe16d4f202c59a560533a223bc6375739ee30944.tar.gz kernel-qcow2-linux-fe16d4f202c59a560533a223bc6375739ee30944.tar.xz kernel-qcow2-linux-fe16d4f202c59a560533a223bc6375739ee30944.zip | |
Revert "libata-eh: Set 'information' field for autosense"
This reverts commit a1524f226a02aa6edebd90ae0752e97cfd78b159.
As implemented, ACS-4 sense reporting for ATA devices bypasses error
diagnosis and handling in libata degrading EH behavior significantly.
Revert the related changes for now.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Hannes Reinecke <hare@suse.de>
Cc: stable@vger.kernel.org #v4.1+
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index db5d9f79a247..426bc12459de 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -694,11 +694,11 @@ static int ata_rwcmd_protocol(struct ata_taskfile *tf, struct ata_device *dev) * RETURNS: * Block address read from @tf. */ -u64 ata_tf_read_block(const struct ata_taskfile *tf, struct ata_device *dev) +u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev) { u64 block = 0; - if (!dev || tf->flags & ATA_TFLAG_LBA) { + if (tf->flags & ATA_TFLAG_LBA) { if (tf->flags & ATA_TFLAG_LBA48) { block |= (u64)tf->hob_lbah << 40; block |= (u64)tf->hob_lbam << 32; |