Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
staging
/
rts5208
/
sd.c
diff --git
a/kernel/drivers/staging/rts5208/sd.c
b/kernel/drivers/staging/rts5208/sd.c
index
a8d657b
..
d6c4982
100644
(file)
--- a/
kernel/drivers/staging/rts5208/sd.c
+++ b/
kernel/drivers/staging/rts5208/sd.c
@@
-246,11
+246,10
@@
RTY_SEND_CMD:
}
}
#ifdef SUPPORT_SD_LOCK
}
}
#ifdef SUPPORT_SD_LOCK
- if (ptr[1] & 0x7D)
+ if (ptr[1] & 0x7D)
{
#else
#else
- if (ptr[1] & 0x7F)
+ if (ptr[1] & 0x7F)
{
#endif
#endif
- {
dev_dbg(rtsx_dev(chip), "ptr[1]: 0x%02x\n",
ptr[1]);
rtsx_trace(chip);
dev_dbg(rtsx_dev(chip), "ptr[1]: 0x%02x\n",
ptr[1]);
rtsx_trace(chip);
@@
-3520,12
+3519,11
@@
int reset_sd_card(struct rtsx_chip *chip)
if (chip->sd_io) {
rtsx_trace(chip);
return STATUS_FAIL;
if (chip->sd_io) {
rtsx_trace(chip);
return STATUS_FAIL;
- } else {
- retval = reset_mmc(chip);
- if (retval != STATUS_SUCCESS) {
- rtsx_trace(chip);
- return STATUS_FAIL;
- }
+ }
+ retval = reset_mmc(chip);
+ if (retval != STATUS_SUCCESS) {
+ rtsx_trace(chip);
+ return STATUS_FAIL;
}
}
}
}
}
}
@@
-4149,11
+4147,10
@@
RTY_SEND_CMD:
}
}
#ifdef SUPPORT_SD_LOCK
}
}
#ifdef SUPPORT_SD_LOCK
- if (ptr[1] & 0x7D)
+ if (ptr[1] & 0x7D)
{
#else
#else
- if (ptr[1] & 0x7F)
+ if (ptr[1] & 0x7F)
{
#endif
#endif
- {
rtsx_trace(chip);
return STATUS_FAIL;
}
rtsx_trace(chip);
return STATUS_FAIL;
}