diff --git a/[refs] b/[refs]
index 8a6b9b864987..9cbc190e3d6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2eb44eb9c8026f3f548bfbc903156b6aea54ed24
+refs/heads/master: 4d4fb2660ddd2d8131ebc3314e4c648fc0f4b8dd
diff --git a/trunk/arch/arm/mach-msm/smd.c b/trunk/arch/arm/mach-msm/smd.c
index 64d12323995e..78031c0a6db3 100644
--- a/trunk/arch/arm/mach-msm/smd.c
+++ b/trunk/arch/arm/mach-msm/smd.c
@@ -204,7 +204,10 @@ static void smd_channel_probe_worker(struct work_struct *work)
 	unsigned n;
 
 	shared = smem_find(ID_CH_ALLOC_TBL, sizeof(*shared) * 64);
-
+	if (!shared) {
+		pr_err("smd: cannot find allocation table\n");
+		return;
+	}
 	for (n = 0; n < 64; n++) {
 		if (smd_ch_allocated[n])
 			continue;