mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
MMC: S3C24XX: Add media presence test to request handling.
Ensure that we have physical media present before attempting to send a request to a card. This ensures that we do not get flooded by errors from commands that can never be completed timing out. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
parent
2de5f79d4d
commit
50a845700b
2 changed files with 19 additions and 1 deletions
|
@ -984,6 +984,18 @@ static void s3cmci_send_request(struct mmc_host *mmc)
|
|||
enable_irq(host->irq);
|
||||
}
|
||||
|
||||
static int s3cmci_card_present(struct s3cmci_host *host)
|
||||
{
|
||||
struct s3c24xx_mci_pdata *pdata = host->pdata;
|
||||
int ret;
|
||||
|
||||
if (pdata->gpio_detect == 0)
|
||||
return -ENOSYS;
|
||||
|
||||
ret = s3c2410_gpio_getpin(pdata->gpio_detect) ? 0 : 1;
|
||||
return ret ^ pdata->detect_invert;
|
||||
}
|
||||
|
||||
static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
||||
{
|
||||
struct s3cmci_host *host = mmc_priv(mmc);
|
||||
|
@ -992,7 +1004,12 @@ static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
|||
host->cmd_is_stop = 0;
|
||||
host->mrq = mrq;
|
||||
|
||||
s3cmci_send_request(mmc);
|
||||
if (s3cmci_card_present(host) == 0) {
|
||||
dbg(host, dbg_err, "%s: no medium present\n", __func__);
|
||||
host->mrq->cmd->error = -ENOMEDIUM;
|
||||
mmc_request_done(mmc, mrq);
|
||||
} else
|
||||
s3cmci_send_request(mmc);
|
||||
}
|
||||
|
||||
static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
struct s3c24xx_mci_pdata {
|
||||
unsigned int wprotect_invert : 1;
|
||||
unsigned int detect_invert : 1; /* set => detect active high. */
|
||||
|
||||
unsigned int gpio_detect;
|
||||
unsigned int gpio_wprotect;
|
||||
|
|
Loading…
Reference in a new issue