leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: rtsx: finish request if no card exist

Browse Source 
Return error-code directly if no card exist, this can
make card remove faster.

Signed-off-by: Micky Ching <micky_ching@realsil.com.cn>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Micky Ching
2015-01-14 11:09:11 +08:00
committed by Ulf Hansson
parent 3e7cf90213
commit b22217f966
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/host/rtsx_pci_sdmmc.c
View File

@@ -100,6 +100,11 @@ static void sd_print_debug_regs(struct realtek_pci_sdmmc *host)
#define sd_print_debug_regs(host) #define sd_print_debug_regs(host)
#endif /* DEBUG */ #endif /* DEBUG */
static inline int sd_get_cd_int(struct realtek_pci_sdmmc *host)
{
return rtsx_pci_readl(host->pcr, RTSX_BIPR) & SD_EXIST;
}
static void sd_cmd_set_sd_cmd(struct rtsx_pcr *pcr, struct mmc_command *cmd) static void sd_cmd_set_sd_cmd(struct rtsx_pcr *pcr, struct mmc_command *cmd)
{ {
rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_CMD0, 0xFF, rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_CMD0, 0xFF,
@@ -798,7 +803,7 @@ static void sd_request(struct work_struct *work)
unsigned int data_size = 0; unsigned int data_size = 0;
int err; int err;
if (host->eject) { if (host->eject || !sd_get_cd_int(host)) {
cmd->error = -ENOMEDIUM; cmd->error = -ENOMEDIUM;
goto finish; goto finish;
} }
@@ -1116,7 +1121,7 @@ static int sdmmc_get_cd(struct mmc_host *mmc)
u32 val; u32 val;
if (host->eject) if (host->eject)
return -ENOMEDIUM; return cd;
mutex_lock(&pcr->pcr_mutex); mutex_lock(&pcr->pcr_mutex);