diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-22 10:33:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-22 10:33:38 -0400 |
| commit | 66a26a8fa7694cdfa418d1527416c4ea079309f4 (patch) | |
| tree | bedf1c89bf03d074bc7d636e9783d82df093506e /arch | |
| parent | 9a2845c453d170e4e9b1437fa671dbf39b0e7bd8 (diff) | |
| parent | 8e9bb19ef97d6594e735bee64b6d72103e350854 (diff) | |
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) | |||
| 263 | struct i2c_msg msg; | 263 | struct i2c_msg msg; |
| 264 | int ret; | 264 | int ret; |
| 265 | 265 | ||
| 266 | if (!a) | ||
| 267 | return -ENODEV; | ||
| 268 | |||
| 266 | camera_power(1); | 269 | camera_power(1); |
| 267 | msg.addr = 0x6e; | 270 | msg.addr = 0x6e; |
| 268 | msg.buf = camera_ncm03j_magic; | 271 | msg.buf = camera_ncm03j_magic; |