diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-22 16:33:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-22 16:33:38 +0200 |
| commit | 66a26a8fa7694cdfa418d1527416c4ea079309f4 (patch) | |
| tree | bedf1c89bf03d074bc7d636e9783d82df093506e /arch | |
| parent | ipmi: fix ipmi_si modprobe hang (diff) | |
| parent | video: stop sh_mobile_lcdcfb only if started (diff) | |
| download | linux-66a26a8fa7694cdfa418d1527416c4ea079309f4.tar.xz linux-66a26a8fa7694cdfa418d1527416c4ea079309f4.zip | |
Merge branch 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
video: stop sh_mobile_lcdcfb only if started
sh: ap325 camera without i2c driver fix
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/boards/board-ap325rxa.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index 39e46919df14..f2a29641b6a3 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; |