diff options
Diffstat (limited to 'drivers/mtd/maps/pcmciamtd.c')
-rw-r--r-- | drivers/mtd/maps/pcmciamtd.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c index 8f7ca863f89d..90924fb00481 100644 --- a/drivers/mtd/maps/pcmciamtd.c +++ b/drivers/mtd/maps/pcmciamtd.c | |||
@@ -495,17 +495,14 @@ static int pcmciamtd_config(struct pcmcia_device *link) | |||
495 | int i; | 495 | int i; |
496 | config_info_t t; | 496 | config_info_t t; |
497 | static char *probes[] = { "jedec_probe", "cfi_probe" }; | 497 | static char *probes[] = { "jedec_probe", "cfi_probe" }; |
498 | cisinfo_t cisinfo; | ||
499 | int new_name = 0; | 498 | int new_name = 0; |
500 | 499 | ||
501 | DEBUG(3, "link=0x%p", link); | 500 | DEBUG(3, "link=0x%p", link); |
502 | 501 | ||
503 | DEBUG(2, "Validating CIS"); | 502 | DEBUG(2, "Validating CIS"); |
504 | ret = pcmcia_validate_cis(link, &cisinfo); | 503 | ret = pcmcia_validate_cis(link, NULL); |
505 | if(ret != CS_SUCCESS) { | 504 | if(ret != CS_SUCCESS) { |
506 | cs_error(link, GetTupleData, ret); | 505 | cs_error(link, GetTupleData, ret); |
507 | } else { | ||
508 | DEBUG(2, "ValidateCIS found %d chains", cisinfo.Chains); | ||
509 | } | 506 | } |
510 | 507 | ||
511 | card_settings(dev, link, &new_name); | 508 | card_settings(dev, link, &new_name); |
@@ -560,9 +557,7 @@ static int pcmciamtd_config(struct pcmcia_device *link) | |||
560 | DEBUG(1, "Allocated a window of %dKiB", dev->win_size >> 10); | 557 | DEBUG(1, "Allocated a window of %dKiB", dev->win_size >> 10); |
561 | 558 | ||
562 | /* Get write protect status */ | 559 | /* Get write protect status */ |
563 | CS_CHECK(GetStatus, pcmcia_get_status(link, &status)); | 560 | DEBUG(2, "window handle = 0x%8.8lx", (unsigned long)link->win); |
564 | DEBUG(2, "status value: 0x%x window handle = 0x%8.8lx", | ||
565 | status.CardState, (unsigned long)link->win); | ||
566 | dev->win_base = ioremap(req.Base, req.Size); | 561 | dev->win_base = ioremap(req.Base, req.Size); |
567 | if(!dev->win_base) { | 562 | if(!dev->win_base) { |
568 | err("ioremap(%lu, %u) failed", req.Base, req.Size); | 563 | err("ioremap(%lu, %u) failed", req.Base, req.Size); |