Skip to contentSkip to conversation

PATCH - update pata_pcmcia/ide-cs with transcend and kingston cards

PATCH Applied Kristoffer Ericson 3 participants 4 messages Apr 19, 2010 – May 2, 2010 libata

lore
Share & tools
lore
#0 lore raw

This patch adds idstrings for Kingston 1GB/4GB and Transcend 4GB/8GB.

drivers/ide/ide-cs.c +4 -0
index ab87e4f..defce28 100644
@@ -409,6 +409,8 @@ static struct pcmcia_device_id ide_ids[] = {
 	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
 	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
 	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),
 	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
@@ -429,6 +431,8 @@ static struct pcmcia_device_id ide_ids[] = {
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),
 	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
 	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
drivers/ata/pata_pcmcia.c +4 -0
index 3c3172d..4164dd2 100644
@@ -424,6 +424,8 @@ static struct pcmcia_device_id pcmcia_devices[] = {
 	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
 	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
 	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),
 	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
@@ -444,6 +446,8 @@ static struct pcmcia_device_id pcmcia_devices[] = {
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),
 	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
 	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
Signature · 1 line
Kristoffer Ericson <[email protected]>
drivers/ide/ide-cs.c +4 -0
index ab87e4f..defce28 100644
@@ -409,6 +409,8 @@ static struct pcmcia_device_id ide_ids[] = {
 	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
 	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
 	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),
 	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
@@ -429,6 +431,8 @@ static struct pcmcia_device_id ide_ids[] = {
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),
 	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
 	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
drivers/ata/pata_pcmcia.c +4 -0
index 3c3172d..4164dd2 100644
@@ -424,6 +424,8 @@ static struct pcmcia_device_id pcmcia_devices[] = {
 	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
 	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
 	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),
 	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),
 	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
@@ -444,6 +446,8 @@ static struct pcmcia_device_id pcmcia_devices[] = {
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),
 	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
 	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
Applied
#1 lore raw
Quoted 42 lines · Kristoffer Ericson

This patch adds idstrings for Kingston 1GB/4GB and Transcend 4GB/8GB.

drivers/ide/ide-cs.c +4 -0
index ab87e4f..defce28 100644
@@ -409,6 +409,8 @@ static struct pcmcia_device_id ide_ids[] = {
  	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),
  	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
@@ -429,6 +431,8 @@ static struct pcmcia_device_id ide_ids[] = {
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),
  	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
  	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
drivers/ata/pata_pcmcia.c +2 -0
index 3c3172d..4164dd2 100644
@@ -424,6 +424,8 @@ static struct pcmcia_device_id pcmcia_devices[] = {
  	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),
  	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 453

Quoted 8 lines
drivers/ata/pata_pcmcia.c +2 -0
@@ -444,6 +446,8 @@ static struct pcmcia_device_id pcmcia_devices[] = {
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),
  	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
  	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),

applied

#2 lore raw

[BUG: invalid hash] - update pata_pcmcia/ide-cs with transcend and kingston cards

Hi,

The hash of "CF CARD 1GB" and "TS4GCF133" are wrong.

pcmcia: pata_pcmcia: invalid hash for product string "CF CARD 1GB": is 0x3e520 e17, should be 0x55d5bffb
pcmcia: see Documentation/pcmcia/devicetable.txt for details
pcmcia: pata_pcmcia: invalid hash for product string "TS4GCF133": is 0x9351e59 d, should be 0x7558f133
pcmcia: see Documentation/pcmcia/devicetable.txt for details

Quoted 6 lines · Kristoffer Ericson
Quoted 4 lines

This patch adds idstrings for Kingston 1GB/4GB and Transcend 4GB/8GB.

Quoted 9 lines

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 412

Quoted 9 lines
drivers/ide/ide-cs.c +1 -0
index ab87e4f..defce28 100644
@@ -409,6 +409,8 @@ static struct pcmcia_device_id ide_ids[] = {
  	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17

),

Quoted 1 line

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 413

Quoted 1 line
drivers/ide/ide-cs.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10

),

Quoted 2 lines

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 415

Quoted 2 lines
drivers/ide/ide-cs.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043

b),

Quoted 3 lines

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 431

Quoted 3 lines
drivers/ide/ide-cs.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
@@ -429,6 +431,8 @@ static struct pcmcia_device_id ide_ids[] = {
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1)

,

Quoted 1 line

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 432

Quoted 1 line
drivers/ide/ide-cs.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2

),

Quoted 1 line

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 433

Quoted 1 line
drivers/ide/ide-cs.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8

),

Quoted 1 line

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 434

Quoted 1 line
drivers/ide/ide-cs.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d)

,

Quoted 1 line

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 435

Quoted 1 line
drivers/ide/ide-cs.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47)

,

Quoted 4 lines
Quoted 4 lines
drivers/ide/ide-cs.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
  	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
drivers/ata/pata_pcmcia.c +0 -0
Quoted 8 lines

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 427

Quoted 8 lines

index 3c3172d..4164dd2 100644

drivers/ata/pata_pcmcia.c +1 -0
@@ -424,6 +424,8 @@ static struct pcmcia_device_id pcmcia_devices[] = {
  	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17

),

Quoted 1 line

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 428

Quoted 1 line
drivers/ata/pata_pcmcia.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10

),

Quoted 2 lines

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 430

Quoted 2 lines
drivers/ata/pata_pcmcia.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043

b),

Quoted 3 lines

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 446

Quoted 3 lines
drivers/ata/pata_pcmcia.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
@@ -444,6 +446,8 @@ static struct pcmcia_device_id pcmcia_devices[] = {
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1)

,

Quoted 1 line

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 447

Quoted 1 line
drivers/ata/pata_pcmcia.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2

),

Quoted 1 line

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 448

Quoted 1 line
drivers/ata/pata_pcmcia.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8

),

Quoted 1 line

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 449

Quoted 1 line
drivers/ata/pata_pcmcia.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d)

,

Quoted 1 line

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 450

Quoted 1 line
drivers/ata/pata_pcmcia.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47)

,

Quoted 4 lines

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 453

Quoted 4 lines
drivers/ata/pata_pcmcia.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
  	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),

Best Regards
Komuro

#3 lore raw

Re: [BUG: invalid hash] - update pata_pcmcia/ide-cs with transcend and kingston cards

Quoted 11 lines · Komuro

Hi,

The hash of "CF CARD 1GB" and "TS4GCF133" are wrong.

pcmcia: pata_pcmcia: invalid hash for product string "CF CARD 1GB": is 0x3e520 e17, should be 0x55d5bffb
pcmcia: see Documentation/pcmcia/devicetable.txt for details
pcmcia: pata_pcmcia: invalid hash for product string "TS4GCF133": is 0x9351e59 d, should be 0x7558f133
pcmcia: see Documentation/pcmcia/devicetable.txt for details

Ah, must have used the wrong hash settings on my converter for those. Will post fixup patch shortly. Thanks!

Kristoffer

Quoted 70 lines
Quoted 6 lines · Kristoffer Ericson
Quoted 4 lines

This patch adds idstrings for Kingston 1GB/4GB and Transcend 4GB/8GB.

Quoted 9 lines

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 412

Quoted 9 lines
drivers/ide/ide-cs.c +1 -0
index ab87e4f..defce28 100644
@@ -409,6 +409,8 @@ static struct pcmcia_device_id ide_ids[] = {
  	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17

),

Quoted 1 line

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 413

Quoted 1 line
drivers/ide/ide-cs.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10

),

Quoted 2 lines

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 415

Quoted 2 lines
drivers/ide/ide-cs.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043

b),

Quoted 3 lines

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 431

Quoted 3 lines
drivers/ide/ide-cs.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
@@ -429,6 +431,8 @@ static struct pcmcia_device_id ide_ids[] = {
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1)

,

Quoted 1 line

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 432

Quoted 1 line
drivers/ide/ide-cs.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2

),

Quoted 1 line

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 433

Quoted 1 line
drivers/ide/ide-cs.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8

),

Quoted 1 line

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 434

Quoted 1 line
drivers/ide/ide-cs.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d)

,

Quoted 1 line

drivers/ide/ide-cs.c static struct pcmcia_device_id ide_ids[] = { · line 435

Quoted 1 line
drivers/ide/ide-cs.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47)

,

Quoted 4 lines
Quoted 4 lines
drivers/ide/ide-cs.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
  	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
drivers/ata/pata_pcmcia.c +0 -0
Quoted 8 lines

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 427

Quoted 8 lines

index 3c3172d..4164dd2 100644

drivers/ata/pata_pcmcia.c +1 -0
@@ -424,6 +424,8 @@ static struct pcmcia_device_id pcmcia_devices[] = {
  	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
  	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17

),

Quoted 1 line

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 428

Quoted 1 line
drivers/ata/pata_pcmcia.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10

),

Quoted 2 lines

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 430

Quoted 2 lines
drivers/ata/pata_pcmcia.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043

b),

Quoted 3 lines

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 446

Quoted 3 lines
drivers/ata/pata_pcmcia.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
@@ -444,6 +446,8 @@ static struct pcmcia_device_id pcmcia_devices[] = {
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1)

,

Quoted 1 line

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 447

Quoted 1 line
drivers/ata/pata_pcmcia.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2

),

Quoted 1 line

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 448

Quoted 1 line
drivers/ata/pata_pcmcia.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8

),

Quoted 1 line

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 449

Quoted 1 line
drivers/ata/pata_pcmcia.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d)

,

Quoted 1 line

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 450

Quoted 1 line
drivers/ata/pata_pcmcia.c +1 -0
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47)

,

Quoted 4 lines

drivers/ata/pata_pcmcia.c static struct pcmcia_device_id pcmcia_devices[] = { · line 453

Quoted 4 lines
drivers/ata/pata_pcmcia.c +0 -0
  	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
  	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
  	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),

Best Regards
Komuro