From c8671a147cfd70890c5352d55ca5b4663f87ca91 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Wed, 11 May 2011 14:38:26 +0100
Subject: [PATCH] --- yaml --- r: 249599 b: refs/heads/master c:
 1dce160f027763253c316f5bcd3cc7b686d988d2 h: refs/heads/master i:   249597:
 3aba2a0d13cc4b4c523d46656276a139bb23bb85   249595:
 c8b1b266e2035e19a8203c3564d9e453058fb76b   249591:
 8d5ce0ff89356040c88e622c7c7e274da10cddb5   249583:
 88b434cd952e8e793138f099da492ec12820c55d   249567:
 a849cd77b4accaaa728690f4ab4c763f559db6fe   249535:
 f18d996d0a9ac912c66b347cd1c0d2293483c4cb   249471:
 0e99fd1b5bda98073b5853177dde7d5e04bd5871   249343:
 bd5b9c42531d8b2415aa2fae85c3186407aada7d v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cf197a18d00f..1900b5fe2087 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cda64a5590fcb7349416479ad783ac2dcb20b677
+refs/heads/master: 1dce160f027763253c316f5bcd3cc7b686d988d2
diff --git a/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c b/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c
index bb64f2a767f8..308d1c3ec40a 100644
--- a/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ b/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -527,7 +527,9 @@ int register_sst_card(struct intel_sst_card_ops *card)
 		pr_err("Repeat for registration..denied\n");
 		return -EBADRQC;
 	}
-	sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;
+	/* The ASoC code doesn't set scard_ops */
+	if (sst_drv_ctx->scard_ops)
+		sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;
 	return 0;
 }
 EXPORT_SYMBOL_GPL(register_sst_card);