diff --git a/[refs] b/[refs]
index a80a5076e56d..87d7f2cfbd55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 680417bb318adc5f1f8f392730776176fbcdedd8
+refs/heads/master: 572064280ecc9dc89227cf3797bc2144896a34f5
diff --git a/trunk/drivers/media/video/adp1653.c b/trunk/drivers/media/video/adp1653.c
index be7befd60947..8ad89ffe2cc3 100644
--- a/trunk/drivers/media/video/adp1653.c
+++ b/trunk/drivers/media/video/adp1653.c
@@ -413,6 +413,10 @@ static int adp1653_probe(struct i2c_client *client,
 	struct adp1653_flash *flash;
 	int ret;
 
+	/* we couldn't work without platform data */
+	if (client->dev.platform_data == NULL)
+		return -ENODEV;
+
 	flash = kzalloc(sizeof(*flash), GFP_KERNEL);
 	if (flash == NULL)
 		return -ENOMEM;