summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-05-20 14:30:06 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-05-22 13:19:11 +0900
commit37869fa2da1a952ed736858f8b9e45c0b9131ae9 (patch)
treeeb7ae599e4fd98008651070cb2847a1a7c896a19 /arch
parent5805977e63a36ad56594a623f3bd2bebcb7db233 (diff)
downloadop-kernel-dev-37869fa2da1a952ed736858f8b9e45c0b9131ae9.zip
op-kernel-dev-37869fa2da1a952ed736858f8b9e45c0b9131ae9.tar.gz
sh: ap325 camera without i2c driver fix
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/boards/board-ap325rxa.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 39e4691..f2a2964 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -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;
OpenPOWER on IntegriCloud