From 76bf007175180f7bd6ab2b6f573d8edbcaedd41f Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Wed, 11 Apr 2012 23:32:05 +0300 Subject: [PATCH] --- yaml --- r: 307962 b: refs/heads/master c: f6f44590f231cdf914ce740f3a53a6b815bf4767 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/mmc.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b07492b0b987..4e6bb0e72dbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c02f000e78347aa51822feb189fcb0d90273958 +refs/heads/master: f6f44590f231cdf914ce740f3a53a6b815bf4767 diff --git a/trunk/drivers/mmc/core/mmc.c b/trunk/drivers/mmc/core/mmc.c index 163046030773..2f0e11c9fd67 100644 --- a/trunk/drivers/mmc/core/mmc.c +++ b/trunk/drivers/mmc/core/mmc.c @@ -539,14 +539,10 @@ static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width) err = mmc_get_ext_csd(card, &bw_ext_csd); if (err || bw_ext_csd == NULL) { - if (bus_width != MMC_BUS_WIDTH_1) - err = -EINVAL; + err = -EINVAL; goto out; } - if (bus_width == MMC_BUS_WIDTH_1) - goto out; - /* only compare read only fields */ err = !((card->ext_csd.raw_partition_support == bw_ext_csd[EXT_CSD_PARTITION_SUPPORT]) &&