Merge remote-tracking branch 'bluetooth/master'

[deliverable/linux.git] / drivers / media / i2c / adv7511.c

diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c
index 53030d631653a8488c56a72d7d1bd45a93e18247..5ba0f21bcfe480288c52172e001f5bf58bd14f1b 100644 (file)
--- a/drivers/media/i2c/adv7511.c
+++ b/drivers/media/i2c/adv7511.c
@@ -1898,6 +1898,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id *
                                               state->i2c_cec_addr >> 1);
                if (state->i2c_cec == NULL) {
                        v4l2_err(sd, "failed to register cec i2c client\n");
+                       err = -ENOMEM;
                        goto err_unreg_edid;
                }
                adv7511_wr(sd, 0xe2, 0x00); /* power up cec section */