Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index d6f934886b04..f9c1acb4ed6a 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -119,6 +119,10 @@ static int lba_capacity_is_ok (struct hd_driveid *id)
 {
         unsigned long lba_sects, chs_sects, head, tail;
 
+        /* No non-LBA info .. so valid! */
+        if (id->cyls == 0)
+                return 1;
+
         /*
          * The ATA spec tells large drives to return
          * C/H/S = 16383/16/63 independent of their size.