From 1f77d78f5aa9a0acd08c86359a851df9117d7c38 Mon Sep 17 00:00:00 2001 From: Toshiaki Yamane Date: Fri, 7 Sep 2012 13:34:28 +0900 Subject: [PATCH] --- yaml --- r: 325031 b: refs/heads/master c: 715c7c8c27bd3cc1e1c577b25d27757d44795b63 h: refs/heads/master i: 325029: 6c36e845d9409b4bc01a4a422959e4acafcb7ed4 325027: 88ccdde1bd05f8fca41eec6864997a9f4fc07ffd 325023: 751191944175591a03fdd5d1428bbcff7c1b000d v: v3 --- [refs] | 2 +- trunk/drivers/staging/rts_pstor/sd.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5617c2bc0264..62bd45d57c1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a871500d2b545a5e99c2f3e5d1f216d2b97ff1e +refs/heads/master: 715c7c8c27bd3cc1e1c577b25d27757d44795b63 diff --git a/trunk/drivers/staging/rts_pstor/sd.c b/trunk/drivers/staging/rts_pstor/sd.c index 7be380563a73..731834926c5d 100644 --- a/trunk/drivers/staging/rts_pstor/sd.c +++ b/trunk/drivers/staging/rts_pstor/sd.c @@ -2126,13 +2126,12 @@ static int sd_read_lba0(struct rtsx_chip *chip) if (CHK_SD(sd_card)) { bus_width = SD_BUS_WIDTH_4; } else { - if (CHK_MMC_8BIT(sd_card)) { + if (CHK_MMC_8BIT(sd_card)) bus_width = SD_BUS_WIDTH_8; - } else if (CHK_MMC_4BIT(sd_card)) { + else if (CHK_MMC_4BIT(sd_card)) bus_width = SD_BUS_WIDTH_4; - } else { + else bus_width = SD_BUS_WIDTH_1; - } } retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd,