sdio.c (8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2) sdio.c (57f0adc7eaaf4315d568e72069dbe48aa7e20995)
1/*
2 * linux/drivers/mmc/sdio.c
3 *
4 * Copyright 2006-2007 Pierre Ossman
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or (at

--- 444 unchanged lines hidden (view full) ---

453 int same = (card->cis.vendor == oldcard->cis.vendor &&
454 card->cis.device == oldcard->cis.device);
455 mmc_remove_card(card);
456 if (!same)
457 return -ENOENT;
458
459 card = oldcard;
460 }
1/*
2 * linux/drivers/mmc/sdio.c
3 *
4 * Copyright 2006-2007 Pierre Ossman
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or (at

--- 444 unchanged lines hidden (view full) ---

453 int same = (card->cis.vendor == oldcard->cis.vendor &&
454 card->cis.device == oldcard->cis.device);
455 mmc_remove_card(card);
456 if (!same)
457 return -ENOENT;
458
459 card = oldcard;
460 }
461 mmc_fixup_device(card);
461
462 if (card->type == MMC_TYPE_SD_COMBO) {
463 err = mmc_sd_setup_card(host, card, oldcard != NULL);
464 /* handle as SDIO-only card if memory init failed */
465 if (err) {
466 mmc_go_idle(host);
467 if (mmc_host_is_spi(host))
468 /* should not fail, as it worked previously */

--- 361 unchanged lines hidden --- 		462
463 if (card->type == MMC_TYPE_SD_COMBO) {
464 err = mmc_sd_setup_card(host, card, oldcard != NULL);
465 /* handle as SDIO-only card if memory init failed */
466 if (err) {
467 mmc_go_idle(host);
468 if (mmc_host_is_spi(host))
469 /* should not fail, as it worked previously */

--- 361 unchanged lines hidden ---