PATCH: deal with further ITE funny, fix a couple of ite8212 errors

PATCH: deal with further ITE funny, fix a couple of ite8212 errors

[Alan Cox]

Further stuff c/o Bryce the wondertester


--- drivers/ide/ide-probe.c~	2004-08-16 16:19:05.830364888 +0100
+++ drivers/ide/ide-probe.c	2004-08-16 16:19:05.831364736 +0100
@@ -784,6 +784,8 @@
 			if(strcmp(hwif->drives[0].id->model, drive->id->model) == 0 &&
 			   /* Don't do this for noprobe or non ATA */
 			   strcmp(drive->id->model, "UNKNOWN") &&
+			   /* ITE haven't got this figured out either (see the quirk code too) */
+			   !strstr(drive->id->model, "Integrated Technology Express") &&
 			   /* And beware of confused Maxtor drives that go "M0000000000" 
 			      "The SN# is garbage in the ID block..." [Eric] */
 			   strncmp(drive->id->serial_no, "M0000000000000000000", 20) && 
--- drivers/ide/pci/it8212.c~	2004-08-16 16:22:09.545435952 +0100
+++ drivers/ide/pci/it8212.c	2004-08-16 16:14:23.251323432 +0100
@@ -78,7 +78,7 @@
 
 struct it8212_dev
 {
-	int smart:1,			/* Are we in smart raid mode */
+	unsigned int smart:1,		/* Are we in smart raid mode */
 		timing10:1;		/* Rev 0x10 */
 	u8	clock_mode;		/* 0, ATA_50 or ATA_66 */
 	u8	want[2][2];		/* Mode/Pri log for master slave */
@@ -652,7 +652,7 @@
 		printk(KERN_ERR "it8212: out of memory, falling back to legacy behaviour.\n");
 		goto fallback;
 	}
-	memset(idev, 0, sizeof(*idev));
+	memset(idev, 0, sizeof(struct it8212_dev));
 	ide_set_hwifdata(hwif, idev);
 
 	hwif->remove = it8212_memfree;