Skip to content

Commit d43824e

Browse files
committed
Merge pull request #1240 from JanLuca/rpi-4.3.y
MMC: Do not use mmc_debug if CONFIG_MMC_BCM2835 is not set
2 parents 1865e8c + 9c42ec7 commit d43824e

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/mmc/core/quirks.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ static const struct mmc_fixup mmc_fixup_methods[] = {
7171

7272
void mmc_fixup_device(struct mmc_card *card, const struct mmc_fixup *table)
7373
{
74+
#ifdef CONFIG_MMC_BCM2835
7475
extern unsigned mmc_debug;
76+
#endif
7577
const struct mmc_fixup *f;
7678
u64 rev = cid_rev_card(card);
7779

@@ -99,7 +101,9 @@ void mmc_fixup_device(struct mmc_card *card, const struct mmc_fixup *table)
99101
/* SDHCI on BCM2708 - bug causes a certain sequence of CMD23 operations to fail.
100102
* Disable this flag for all cards (fall-back to CMD25/CMD18 multi-block transfers).
101103
*/
104+
#ifdef CONFIG_MMC_BCM2835
102105
if (mmc_debug & (1<<13))
103106
card->quirks |= MMC_QUIRK_BLK_NO_CMD23;
107+
#endif
104108
}
105109
EXPORT_SYMBOL(mmc_fixup_device);

0 commit comments

Comments
 (0)