aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Lavinen <jarkko.lavinen@nokia.com>2009-09-22 19:44:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 10:39:35 -0400
commit0a40e64786933fb04be37af0a19aa320bc3414a8 (patch)
tree095fb17e41d86cc1e01cb3d25b8a7cbd1f594c5a
parent13189e78caa824f0285b1823519c020591641207 (diff)
omap_hsmmc: fix NULL pointer dereference
Do not call 'mmc_omap_xfer_done()' if the request is already done. Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com> Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Acked-by: Matt Fleming <matt@console-pimps.org> Cc: Ian Molton <ian@mnementh.co.uk> Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com> Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com> Cc: Denis Karpov <ext-denis.2.karpov@nokia.com> Cc: Pierre Ossman <pierre@ossman.eu> Cc: Philip Langdale <philipl@overt.org> Cc: "Madhusudhan" <madhu.cr@ti.com> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/mmc/host/omap_hsmmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index b83f7a4d8e28..9519964ecb2a 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -677,7 +677,7 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
677 677
678 if (end_cmd || ((status & CC) && host->cmd)) 678 if (end_cmd || ((status & CC) && host->cmd))
679 mmc_omap_cmd_done(host, host->cmd); 679 mmc_omap_cmd_done(host, host->cmd);
680 if (end_trans || (status & TC)) 680 if ((end_trans || (status & TC)) && host->mrq)
681 mmc_omap_xfer_done(host, data); 681 mmc_omap_xfer_done(host, data);
682 682
683 return IRQ_HANDLED; 683 return IRQ_HANDLED;