Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325027
b: refs/heads/master
c: 81f2ff3
h: refs/heads/master
i:
  325025: 1520933
  325023: 7511919
v: v3
  • Loading branch information
Toshiaki Yamane authored and Greg Kroah-Hartman committed Sep 10, 2012
1 parent a873b32 commit 88ccdde
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 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: d6cfef0bf6642d9e368d5b39b7896ea9de7d73bc
refs/heads/master: 81f2ff3ba5bfe04088d151a8ba5040c5ed048f0f
17 changes: 6 additions & 11 deletions trunk/drivers/staging/rts_pstor/sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1900,9 +1900,8 @@ int sd_switch_clock(struct rtsx_chip *chip)
int re_tuning = 0;

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

if (CHECK_PID(chip, 0x5209) &&
(CHK_SD30_SPEED(sd_card) || CHK_MMC_DDR52(sd_card))) {
Expand All @@ -1913,26 +1912,22 @@ int sd_switch_clock(struct rtsx_chip *chip)
}

retval = switch_clock(chip, sd_card->sd_clock);
if (retval != STATUS_SUCCESS) {
if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL);
}

if (re_tuning) {
if (CHK_SD(sd_card)) {
if (CHK_SD_DDR50(sd_card)) {
if (CHK_SD_DDR50(sd_card))
retval = sd_ddr_tuning(chip);
} else {
else
retval = sd_sdr_tuning(chip);
}
} else {
if (CHK_MMC_DDR52(sd_card)) {
if (CHK_MMC_DDR52(sd_card))
retval = mmc_ddr_tuning(chip);
}
}

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

return STATUS_SUCCESS;
Expand Down

0 comments on commit 88ccdde

Please sign in to comment.