diff options
Diffstat (limited to 'drivers/ide/legacy/ide-cs.c')
-rw-r--r-- | drivers/ide/legacy/ide-cs.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 7e8d778dcb88..1b996e62a404 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
@@ -199,13 +199,9 @@ static int ide_config(struct pcmcia_device *link) | |||
199 | link->conf.ConfigBase = stk->parse.config.base; | 199 | link->conf.ConfigBase = stk->parse.config.base; |
200 | link->conf.Present = stk->parse.config.rmask[0]; | 200 | link->conf.Present = stk->parse.config.rmask[0]; |
201 | 201 | ||
202 | tuple.DesiredTuple = CISTPL_MANFID; | 202 | is_kme = ((link->manf_id == MANFID_KME) && |
203 | if (!pcmcia_get_first_tuple(link, &tuple) && | 203 | ((link->card_id == PRODID_KME_KXLC005_A) || |
204 | !pcmcia_get_tuple_data(link, &tuple) && | 204 | (link->card_id == PRODID_KME_KXLC005_B))); |
205 | !pcmcia_parse_tuple(link, &tuple, &stk->parse)) | ||
206 | is_kme = ((stk->parse.manfid.manf == MANFID_KME) && | ||
207 | ((stk->parse.manfid.card == PRODID_KME_KXLC005_A) || | ||
208 | (stk->parse.manfid.card == PRODID_KME_KXLC005_B))); | ||
209 | 205 | ||
210 | /* Not sure if this is right... look up the current Vcc */ | 206 | /* Not sure if this is right... look up the current Vcc */ |
211 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf)); | 207 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf)); |