---

yaml --- r: 158517 b: refs/heads/master c: ac8672e h: refs/heads/master i: 158515: 23a8c64 v: v3
git-mirror · Sep 9, 2009 · af3b594 · af3b594
1 parent 47c51a2
commit af3b594
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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;