Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304619
b: refs/heads/master
c: 2ff4ff5
h: refs/heads/master
i:
  304617: 5264e03
  304615: 9416f72
v: v3
  • Loading branch information
Oleksij Rempel authored and Greg Kroah-Hartman committed May 10, 2012
1 parent 19fad2e commit e5060d8
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 231a1a25eb9ccf3ac57f1908500a8d08ba28a62c
refs/heads/master: 2ff4ff54a1d7f54ec587fe2eca737d5cbf32686b
7 changes: 1 addition & 6 deletions trunk/drivers/staging/rts5139/sd_cprm.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@ static inline int get_rsp_type(u8 rsp_code, u8 *rsp_type, int *rsp_len)
return STATUS_SUCCESS;
}

int soft_reset_sd_card(struct rts51x_chip *chip)
{
return reset_sd(chip);
}

int ext_sd_send_cmd_get_rsp(struct rts51x_chip *chip, u8 cmd_idx,
u32 arg, u8 rsp_type, u8 *rsp, int rsp_len,
int special_check)
Expand Down Expand Up @@ -1041,7 +1036,7 @@ int sd_hw_rst(struct scsi_cmnd *srb, struct rts51x_chip *chip)
case 1:
/* reset CMD(CMD0) and Initialization
* (without SD Card Power Off -> ON) */
retval = soft_reset_sd_card(chip);
retval = reset_sd(chip);
if (retval != STATUS_SUCCESS) {
set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
sd_card->pre_cmd_err = 1;
Expand Down

0 comments on commit e5060d8

Please sign in to comment.