ide_cs and Ninja ATA

[Dominik Brodowski]

Hi,

On Fri, Sep 16, 2005 at 09:16:45AM +0200, Christian Zoz wrote:
> Hi,
> 
> in ide_cs.c there is a line for Ninja ATA devices
>   PCMCIA_DEVICE_PROD_ID12(" ", "NinjaATA-", 0x3b6e20c8, 0xebe0bd79),
> But there are also devices with empty prod_id1. We could either add
> another device line
>   PCMCIA_DEVICE_PROD_ID12("", "NinjaATA-", 0x0, 0xebe0bd79),
> Or (better) replace the old with
>   PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
> 
> Can somebody please change this?

Thanks, patch (also attached) is in my queue.

	Dominik


Christian Zoz reported there are multiple NinjaATA devices all sharing the
second product ID string, but not the first one.

Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>

Index: 2.6.14-rc1-git2/drivers/ide/legacy/ide-cs.c
===================================================================
--- 2.6.14-rc1-git2.orig/drivers/ide/legacy/ide-cs.c
+++ 2.6.14-rc1-git2/drivers/ide/legacy/ide-cs.c
@@ -437,7 +437,7 @@ static struct pcmcia_device_id ide_ids[]
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),
 	PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2      ", 0xe37be2b5, 0x8671043b),
-	PCMCIA_DEVICE_PROD_ID12(" ", "NinjaATA-", 0x3b6e20c8, 0xebe0bd79),
+	PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
 	PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),