Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 318031
b: refs/heads/master
c: cf3a5ca
h: refs/heads/master
i:
  318029: 8d99036
  318027: 5b12d06
  318023: c17bc2d
  318015: 811d1be
v: v3
  • Loading branch information
Erik Jones authored and Greg Kroah-Hartman committed Jul 17, 2012
1 parent f376b16 commit bfde842
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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: 39d48bb0607f1c8ac4c57ddba534a402f4fc91e7
refs/heads/master: cf3a5ca084979f0087a8e6f6cd34a6d5ee0decb5
3 changes: 1 addition & 2 deletions trunk/drivers/staging/rts5139/rts51x_card.c
Original file line number Diff line number Diff line change
Expand Up @@ -826,8 +826,7 @@ int card_power_on(struct rts51x_chip *chip, u8 card)
if ((card == SD_CARD) || (card == XD_CARD)) {
RTS51X_WRITE_REG(chip, CARD_PWR_CTL, mask | LDO3318_PWR_MASK,
val1 | LDO_SUSPEND);
}
else {
} else {
#endif
RTS51X_WRITE_REG(chip, CARD_PWR_CTL, mask, val1);
#ifdef SD_XD_IO_FOLLOW_PWR
Expand Down

0 comments on commit bfde842

Please sign in to comment.