Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325032
b: refs/heads/master
c: 90538e4
h: refs/heads/master
v: v3
  • Loading branch information
Toshiaki Yamane authored and Greg Kroah-Hartman committed Sep 10, 2012
1 parent 1f77d78 commit 8476b32
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 715c7c8c27bd3cc1e1c577b25d27757d44795b63
refs/heads/master: 90538e412c5d70d41f6b89cd8617558f687534e3
6 changes: 2 additions & 4 deletions trunk/drivers/staging/rts_pstor/sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -2154,9 +2154,8 @@ static int sd_check_wp_state(struct rtsx_chip *chip)

retval = sd_send_cmd_get_rsp(chip, APP_CMD,
sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
if (retval != STATUS_SUCCESS) {
if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL);
}

cmd[0] = 0x40 | SD_STATUS;
cmd[1] = 0;
Expand Down Expand Up @@ -2184,9 +2183,8 @@ static int sd_check_wp_state(struct rtsx_chip *chip)

/* Check SD Machanical Write-Protect Switch */
val = rtsx_readl(chip, RTSX_BIPR);
if (val & SD_WRITE_PROTECT) {
if (val & SD_WRITE_PROTECT)
chip->card_wp |= SD_CARD;
}

return STATUS_SUCCESS;
}
Expand Down

0 comments on commit 8476b32

Please sign in to comment.