PATCH: Minimal ide-disk updates

[Alan Cox]

These are the minimal updates for ide-disk. They don't remove all ident
whacking in the it8212 driver because there are genuine things to fix
there such as the LBA28 flags.


diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.9rc3/drivers/ide/ide-disk.c linux-2.6.9rc3/drivers/ide/ide-disk.c
--- linux.vanilla-2.6.9rc3/drivers/ide/ide-disk.c	2004-09-30 16:13:08.000000000 +0100
+++ linux-2.6.9rc3/drivers/ide/ide-disk.c	2004-10-04 16:07:29.294774296 +0100
@@ -88,6 +88,10 @@
 {
 	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.
@@ -1602,8 +1606,10 @@
 	if (id->buf_size)
 		printk (" w/%dKiB Cache", id->buf_size/2);
 
-	printk(", CHS=%d/%d/%d", 
-	       drive->bios_cyl, drive->bios_head, drive->bios_sect);
+	if(drive->bios_cyl)
+		printk(", CHS=%d/%d/%d", 
+	       		drive->bios_cyl, drive->bios_head, drive->bios_sect);
+	       		
 	if (drive->using_dma)
 		(void) HWIF(drive)->ide_dma_verbose(drive);
 	printk("\n");

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/