Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324996
b: refs/heads/master
c: a677ff9
h: refs/heads/master
v: v3
  • Loading branch information
Toshiaki Yamane authored and Greg Kroah-Hartman committed Sep 10, 2012
1 parent cec77c7 commit d5c2720
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 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: d4d2dbcaedb9334d0c462129099346d617f61768
refs/heads/master: a677ff913d594393cc98c6d01aa91e5b8bd76a6e
12 changes: 5 additions & 7 deletions trunk/drivers/staging/rts_pstor/sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,9 @@ static int sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,

stat_idx = 16;
} else if (rsp_type != SD_RSP_TYPE_R0) {
for (reg_addr = REG_SD_CMD0; reg_addr <= REG_SD_CMD4; reg_addr++) {
for (reg_addr = REG_SD_CMD0; reg_addr <= REG_SD_CMD4; reg_addr++)
rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0, 0);
}

stat_idx = 5;
}

Expand Down Expand Up @@ -273,9 +273,8 @@ static int sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,
if ((rsp_type == SD_RSP_TYPE_R1) || (rsp_type == SD_RSP_TYPE_R1b)) {
if ((cmd_idx != SEND_RELATIVE_ADDR) && (cmd_idx != SEND_IF_COND)) {
if (cmd_idx != STOP_TRANSMISSION) {
if (ptr[1] & 0x80) {
if (ptr[1] & 0x80)
TRACE_RET(chip, STATUS_FAIL);
}
}
#ifdef SUPPORT_SD_LOCK
if (ptr[1] & 0x7D)
Expand All @@ -294,11 +293,10 @@ static int sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,
RTSX_DEBUGP("ptr[3]: 0x%02x\n", ptr[3]);
TRACE_RET(chip, STATUS_FAIL);
}
if (ptr[3] & 0x01) {
if (ptr[3] & 0x01)
sd_card->sd_data_buf_ready = 1;
} else {
else
sd_card->sd_data_buf_ready = 0;
}
}
}

Expand Down

0 comments on commit d5c2720

Please sign in to comment.