Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325028
b: refs/heads/master
c: 9e80f37
h: refs/heads/master
v: v3
  • Loading branch information
Toshiaki Yamane authored and Greg Kroah-Hartman committed Sep 10, 2012
1 parent 88ccdde commit 0a3462e
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 81f2ff3ba5bfe04088d151a8ba5040c5ed048f0f
refs/heads/master: 9e80f375e07c4d823e749ba9791c04958acf7f6b
11 changes: 4 additions & 7 deletions trunk/drivers/staging/rts_pstor/sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1938,11 +1938,10 @@ static int sd_prepare_reset(struct rtsx_chip *chip)
struct sd_info *sd_card = &(chip->sd_card);
int retval;

if (chip->asic_code) {
if (chip->asic_code)
sd_card->sd_clock = 29;
} else {
else
sd_card->sd_clock = CLK_30;
}

sd_card->sd_type = 0;
sd_card->seq_mode = 0;
Expand All @@ -1958,9 +1957,8 @@ static int sd_prepare_reset(struct rtsx_chip *chip)
chip->sd_io = 0;

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

if (CHECK_PID(chip, 0x5209)) {
RTSX_WRITE_REG(chip, REG_SD_CFG1, 0xFF,
Expand All @@ -1974,9 +1972,8 @@ static int sd_prepare_reset(struct rtsx_chip *chip)
RTSX_WRITE_REG(chip, CARD_STOP, SD_STOP | SD_CLR_ERR, SD_STOP | SD_CLR_ERR);

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

return STATUS_SUCCESS;
}
Expand Down

0 comments on commit 0a3462e

Please sign in to comment.