Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / drivers / media / i2c / mt9v032.c

diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c
index 977f4006edbd496dfa9d45a7e0f4f2ab6dfc40c0..a68ce94ee097604a26f6b3dca6664ab977e66759 100644 (file)
--- a/drivers/media/i2c/mt9v032.c
+++ b/drivers/media/i2c/mt9v032.c
@@ -882,7 +882,7 @@ static const struct regmap_config mt9v032_regmap_config = {
 static struct mt9v032_platform_data *
 mt9v032_get_pdata(struct i2c_client *client)
 {
-       struct mt9v032_platform_data *pdata;
+       struct mt9v032_platform_data *pdata = NULL;
        struct v4l2_of_endpoint endpoint;
        struct device_node *np;
        struct property *prop;