Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...

[cascardo/linux.git] / arch / sh / boards / board-ap325rxa.c

diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 912458f..f2a2964 100644 (file)
--- 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;
@@ -349,6 +352,7 @@ static int ov7725_power(struct device *dev, int mode)
 static struct ov772x_camera_info ov7725_info = {
        .buswidth  = SOCAM_DATAWIDTH_8,
        .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
+       .edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0),
        .link = {
                .power  = ov7725_power,
        },