From af3b5948585517da3c65aaf127382f7ee7493688 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Sun, 16 Aug 2009 21:21:21 +0900
Subject: [PATCH] --- yaml --- r: 158517 b: refs/heads/master c:
 ac8672ea922bde59acf50eaa1eaa1640a6395fd2 h: refs/heads/master i:   158515:
 23a8c64a6f4e129c62929fd2070f6066b8cf70ce v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/libata-core.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a30cccec726e..4142f207360d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b549dcbf607e88f3016bc149109472a46fe7bbb
+refs/heads/master: ac8672ea922bde59acf50eaa1eaa1640a6395fd2
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index 98af50f16e0c..df31deac5c82 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -709,7 +709,13 @@ u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev)
 		head = tf->device & 0xf;
 		sect = tf->lbal;
 
-		block = (cyl * dev->heads + head) * dev->sectors + sect;
+		if (!sect) {
+			ata_dev_printk(dev, KERN_WARNING, "device reported "
+				       "invalid CHS sector 0\n");
+			sect = 1; /* oh well */
+		}
+
+		block = (cyl * dev->heads + head) * dev->sectors + sect - 1;
 	}
 
 	return block;