From 32b74eb659794b01a0197deb23497d05e64f58bc Mon Sep 17 00:00:00 2001 From: Toshiaki Yamane Date: Fri, 7 Sep 2012 13:27:08 +0900 Subject: [PATCH] --- yaml --- r: 325007 b: refs/heads/master c: 3e49983827279204b33efbffb585de8ffe2d002f h: refs/heads/master i: 325005: 65bf5e742b368ed348d38db583f869b60ade69b3 325003: b2c483ec4fc216a9f7f152d5a146ea1f0113df9e 324999: 554fcd2a0388794b83fbfa9382430782b261343c 324991: 2df8fb1dfdb205fdfcc3346119b46b59cae966d2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rts_pstor/sd.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 96ab753e0cbd..f79b7baaa8af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fd3f6a3ccead33fd14eb91df662e5cd8f6daff7 +refs/heads/master: 3e49983827279204b33efbffb585de8ffe2d002f diff --git a/trunk/drivers/staging/rts_pstor/sd.c b/trunk/drivers/staging/rts_pstor/sd.c index 82282314f683..ed95a1a68528 100644 --- a/trunk/drivers/staging/rts_pstor/sd.c +++ b/trunk/drivers/staging/rts_pstor/sd.c @@ -774,18 +774,16 @@ static int sd_change_bank_voltage(struct rtsx_chip *chip, u8 voltage) if (voltage == SD_IO_3V3) { if (chip->asic_code) { retval = rtsx_write_phy_register(chip, 0x08, 0x4FC0 | chip->phy_voltage); - if (retval != STATUS_SUCCESS) { + if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); - } } else { RTSX_WRITE_REG(chip, SD_PAD_CTL, SD_IO_USING_1V8, 0); } } else if (voltage == SD_IO_1V8) { if (chip->asic_code) { retval = rtsx_write_phy_register(chip, 0x08, 0x4C40 | chip->phy_voltage); - if (retval != STATUS_SUCCESS) { + if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); - } } else { RTSX_WRITE_REG(chip, SD_PAD_CTL, SD_IO_USING_1V8, SD_IO_USING_1V8); }