diff options
Diffstat (limited to 'drivers/ata/pata_pcmcia.c')
| -rw-r--r-- | drivers/ata/pata_pcmcia.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 3ce33bfdccc..da7c218c9cc 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
| @@ -164,9 +164,9 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) | |||
| 164 | 164 | ||
| 165 | /* See if we have a manufacturer identifier. Use it to set is_kme for | 165 | /* See if we have a manufacturer identifier. Use it to set is_kme for |
| 166 | vendor quirks */ | 166 | vendor quirks */ |
| 167 | tuple.DesiredTuple = CISTPL_MANFID; | 167 | is_kme = ((pdev->manf_id == MANFID_KME) && |
| 168 | if (!pcmcia_get_first_tuple(pdev, &tuple) && !pcmcia_get_tuple_data(pdev, &tuple) && !pcmcia_parse_tuple(pdev, &tuple, &stk->parse)) | 168 | ((pdev->card_id == PRODID_KME_KXLC005_A) || |
| 169 | is_kme = ((stk->parse.manfid.manf == MANFID_KME) && ((stk->parse.manfid.card == PRODID_KME_KXLC005_A) || (stk->parse.manfid.card == PRODID_KME_KXLC005_B))); | 169 | (pdev->card_id == PRODID_KME_KXLC005_B))); |
| 170 | 170 | ||
| 171 | /* Not sure if this is right... look up the current Vcc */ | 171 | /* Not sure if this is right... look up the current Vcc */ |
| 172 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(pdev, &stk->conf)); | 172 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(pdev, &stk->conf)); |