From 232c7d9e110453cb404854aa9da71fdec3f3af9a Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 22 May 2010 22:16:26 +0200
Subject: [PATCH] --- yaml --- r: 207744 b: refs/heads/master c:
 a4b81ca50974051195b11ca173da073b961f94d5 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/devices/sst25l.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5bb332a6a635..993a031fc279 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00b275dbfc2ae3e3312a910736dd9a6bd5110c2b
+refs/heads/master: a4b81ca50974051195b11ca173da073b961f94d5
diff --git a/trunk/drivers/mtd/devices/sst25l.c b/trunk/drivers/mtd/devices/sst25l.c
index ab5d8cd02a15..684247a8a5ed 100644
--- a/trunk/drivers/mtd/devices/sst25l.c
+++ b/trunk/drivers/mtd/devices/sst25l.c
@@ -454,7 +454,7 @@ static int __init sst25l_probe(struct spi_device *spi)
 						  parts, nr_parts);
 		}
 
-	} else if (data->nr_parts) {
+	} else if (data && data->nr_parts) {
 		dev_warn(&spi->dev, "ignoring %d default partitions on %s\n",
 			 data->nr_parts, data->name);
 	}