]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
mmc: atmel: don't test host->data
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Tue, 6 May 2014 15:43:26 +0000 (17:43 +0200)
committerChris Ball <chris@printf.net>
Mon, 12 May 2014 22:08:23 +0000 (18:08 -0400)
Found using smatch:
drivers/mmc/host/atmel-mci.c:827 atmci_pdc_complete() warn: variable
dereferenced before check 'host->data' (see line 807)

Stop testing host->data as it is not NULL at that point.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
drivers/mmc/host/atmel-mci.c

index 42706ea0ba85407cdead6259756fd4ed1b898016..aece7cafbb9701c6dee629a622d156c74499dbc2 100644 (file)
@@ -820,16 +820,9 @@ static void atmci_pdc_complete(struct atmel_mci *host)
 
        atmci_pdc_cleanup(host);
 
-       /*
-        * If the card was removed, data will be NULL. No point trying
-        * to send the stop command or waiting for NBUSY in this case.
-        */
-       if (host->data) {
-               dev_dbg(&host->pdev->dev,
-                       "(%s) set pending xfer complete\n", __func__);
-               atmci_set_pending(host, EVENT_XFER_COMPLETE);
-               tasklet_schedule(&host->tasklet);
-       }
+       dev_dbg(&host->pdev->dev, "(%s) set pending xfer complete\n", __func__);
+       atmci_set_pending(host, EVENT_XFER_COMPLETE);
+       tasklet_schedule(&host->tasklet);
 }
 
 static void atmci_dma_cleanup(struct atmel_mci *host)