Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325051
b: refs/heads/master
c: a13ce21
h: refs/heads/master
i:
  325049: d2e4087
  325047: 76e2fdf
v: v3
  • Loading branch information
Toshiaki Yamane authored and Greg Kroah-Hartman committed Sep 10, 2012
1 parent 9eea417 commit 2e62a68
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 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: 00e9c108a66482d833ff45303ea85fe20914279a
refs/heads/master: a13ce21fe1abac678a22d1dbc5b8fa1286f0029d
9 changes: 3 additions & 6 deletions trunk/drivers/staging/rts_pstor/sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -4504,26 +4504,23 @@ int sd_power_off_card3v3(struct rtsx_chip *chip)
int retval;

retval = disable_card_clock(chip, SD_CARD);
if (retval != STATUS_SUCCESS) {
if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL);
}

RTSX_WRITE_REG(chip, CARD_OE, SD_OUTPUT_EN, 0);

if (!chip->ft2_fast_mode) {
retval = card_power_off(chip, SD_CARD);
if (retval != STATUS_SUCCESS) {
if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL);
}

wait_timeout(50);
}

if (chip->asic_code) {
retval = sd_pull_ctl_disable(chip);
if (retval != STATUS_SUCCESS) {
if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL);
}
} else {
RTSX_WRITE_REG(chip, FPGA_PULL_CTL,
FPGA_SD_PULL_CTL_BIT | 0x20, FPGA_SD_PULL_CTL_BIT);
Expand Down

0 comments on commit 2e62a68

Please sign in to comment.