Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325011
b: refs/heads/master
c: 220e7b3
h: refs/heads/master
i:
  325009: 28a00ab
  325007: 32b74eb
v: v3
  • Loading branch information
Toshiaki Yamane authored and Greg Kroah-Hartman committed Sep 10, 2012
1 parent 9ec2d09 commit 4f4d131
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 97d31286b77e997dee9a78f945d84662d981eab9
refs/heads/master: 220e7b3cb5ed36347fb6c7f87207d8cb0387d71a
7 changes: 3 additions & 4 deletions trunk/drivers/staging/rts_pstor/sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1141,13 +1141,12 @@ static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode,
*/
u16 cc = ((u16)buf[0] << 8) | buf[1];
RTSX_DEBUGP("Maximum current consumption: %dmA\n", cc);
if ((cc == 0) || (cc > 800)) {
if ((cc == 0) || (cc > 800))
TRACE_RET(chip, STATUS_FAIL);
}

retval = sd_query_switch_result(chip, func_group, func_to_switch, buf, 64);
if (retval != STATUS_SUCCESS) {
if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL);
}

if ((cc > 400) || (func_to_switch > CURRENT_LIMIT_400)) {
RTSX_WRITE_REG(chip, OCPPARA2, SD_OCP_THD_MASK, chip->sd_800mA_ocp_thd);
Expand Down

0 comments on commit 4f4d131

Please sign in to comment.