commit d5b01e59472c890cc44d014962840e3499b8ede6
author Linux Build Service Account <lnxbuild@localhost> Sat Sep 22 01:09:04 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Sep 22 01:08:55 2012 -0700
tree 9657823f45a720e41a869c279a9d100f1152d5be
parent 439183dbca8eaea0eb170e8fc1586f94684d137c
parent d6e48bd07516ecc683a995ebf8eedf080f14016d

Merge "ASoC: wcd9310: Fix NULL pointer dereference"

sound/soc/codecs/wcd9310.c

diff --git a/sound/soc/codecs/wcd9310.c b/sound/soc/codecs/wcd9310.c
index ac11f1a..a47e446 100644
--- a/sound/soc/codecs/wcd9310.c
+++ b/sound/soc/codecs/wcd9310.c
@@ -8379,8 +8379,9 @@
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	struct tabla_priv *tabla = platform_get_drvdata(pdev);
-	dev_dbg(dev, "%s: system resume\n", __func__);
-	tabla->mbhc_last_resume = jiffies;
+	dev_dbg(dev, "%s: system resume tabla %p\n", __func__, tabla);
+	if (tabla)
+		tabla->mbhc_last_resume = jiffies;
 	return 0;
 }