]> git.neil.brown.name Git - history.git/commitdiff
[PATCH] ide-probe.c: SanDisk is flash
authorBartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl>
Fri, 16 Apr 2004 08:03:09 +0000 (01:03 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 16 Apr 2004 08:03:09 +0000 (01:03 -0700)
From: Meelis Roos <mroos@linux.ee>

This is self-explanatory - former SunDisk renamed itself to SanDisk and
now there are flash disks with both names.

drivers/ide/ide-probe.c

index 0dab816b4db45fb13f3ddc82b43140a7094e87b2..78da95051201be797b23dd00be42fbc53651e283 100644 (file)
@@ -103,7 +103,8 @@ static inline int drive_is_flashcard (ide_drive_t *drive)
                if (id->config == 0x848a) return 1;     /* CompactFlash */
                if (!strncmp(id->model, "KODAK ATA_FLASH", 15)  /* Kodak */
                 || !strncmp(id->model, "Hitachi CV", 10)       /* Hitachi */
-                || !strncmp(id->model, "SunDisk SDCFB", 13)    /* SunDisk */
+                || !strncmp(id->model, "SunDisk SDCFB", 13)    /* old SanDisk */
+                || !strncmp(id->model, "SanDisk SDCFB", 13)    /* SanDisk */
                 || !strncmp(id->model, "HAGIWARA HPC", 12)     /* Hagiwara */
                 || !strncmp(id->model, "LEXAR ATA_FLASH", 15)  /* Lexar */
                 || !strncmp(id->model, "ATA_FLASH", 9))        /* Simple Tech */