From 65bf5e742b368ed348d38db583f869b60ade69b3 Mon Sep 17 00:00:00 2001 From: Toshiaki Yamane Date: Fri, 7 Sep 2012 13:26:16 +0900 Subject: [PATCH] --- yaml --- r: 325005 b: refs/heads/master c: 5e0738c1f4a76fa089566b1d528720348c6b5840 h: refs/heads/master i: 325003: b2c483ec4fc216a9f7f152d5a146ea1f0113df9e v: v3 --- [refs] | 2 +- trunk/drivers/staging/rts_pstor/sd.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 455738b4b3f2..ea7de5c063a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c18a261a915cd1acc5ece124fb336fb64cc0b41a +refs/heads/master: 5e0738c1f4a76fa089566b1d528720348c6b5840 diff --git a/trunk/drivers/staging/rts_pstor/sd.c b/trunk/drivers/staging/rts_pstor/sd.c index 4b1763caf4be..2ace2a037f50 100644 --- a/trunk/drivers/staging/rts_pstor/sd.c +++ b/trunk/drivers/staging/rts_pstor/sd.c @@ -731,21 +731,18 @@ static int sd_update_lock_status(struct rtsx_chip *chip) u8 rsp[5]; retval = sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr, SD_RSP_TYPE_R1, rsp, 5); - if (retval != STATUS_SUCCESS) { + if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); - } - if (rsp[1] & 0x02) { + if (rsp[1] & 0x02) sd_card->sd_lock_status |= SD_LOCKED; - } else { + else sd_card->sd_lock_status &= ~SD_LOCKED; - } RTSX_DEBUGP("sd_card->sd_lock_status = 0x%x\n", sd_card->sd_lock_status); - if (rsp[1] & 0x01) { + if (rsp[1] & 0x01) TRACE_RET(chip, STATUS_FAIL); - } return STATUS_SUCCESS; }