sh: ap325 camera without i2c driver fix
authorMagnus Damm <damm@igel.co.jp>
Wed, 20 May 2009 14:30:06 +0000 (14:30 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 22 May 2009 04:19:11 +0000 (13:19 +0900)
This patch fixes the ap325rxa ncm03j camera code to handle
the case where no i2c driver is present. Without this fix
i2c_transfer() may be passed NULL as adapter which results
in a crash.

Triggered when i2c-sh_mobile.c failed to probe() due to
missing MSTP clocks.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/boards/board-ap325rxa.c

index 39e46919df14d8da9521349eea087057e220e142..f2a29641b6a326cc857c8334383717dffc70aba7 100644 (file)
@@ -263,6 +263,9 @@ static int camera_probe(void)
        struct i2c_msg msg;
        int ret;
 
+       if (!a)
+               return -ENODEV;
+
        camera_power(1);
        msg.addr = 0x6e;
        msg.buf = camera_ncm03j_magic;