aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lütke-Stetzkamp <christian@lkamp.de>2018-04-24 20:01:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-25 15:36:19 +0200
commitafcc0ca1c854e8fbed59ec61b2535962a1af6571 (patch)
treedaf9a14276358981efe525b16878840f041023cb
parentRevert "staging: nvec: Augment TODO file with GPIO work item" (diff)
downloadlinux-dev-afcc0ca1c854e8fbed59ec61b2535962a1af6571.tar.xz
linux-dev-afcc0ca1c854e8fbed59ec61b2535962a1af6571.zip
staging: mt7621-mmc: Fix dereference before check in msdc_drv_pm
In the msdc_drv_pm function the variable mmc is dereferenced before checked. Reordering fixes that. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de> Reviewed-by: NeilBrown <neil@brown.name> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/mt7621-mmc/sd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 7f6e584c7836..a3e2c9769591 100644
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -2709,10 +2709,10 @@ static int msdc_drv_remove(struct platform_device *pdev)
static void msdc_drv_pm(struct platform_device *pdev, pm_message state)
{
struct mmc_host *mmc = platform_get_drvdata(pdev);
- struct msdc_host *host = mmc_priv(mmc);
-
- if (mmc)
+ if (mmc) {
+ struct msdc_host *host = mmc_priv(mmc);
msdc_pm(state, (void *)host);
+ }
}
static int msdc_drv_suspend(struct platform_device *pdev, pm_message_t state)