Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / media / platform / soc_camera / soc_camera.c

diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 4843df0095a93962090a5b90836e31eae3326629..b3db51c82bded142ba9efc95a82d73878d18ad6f 100644 (file)
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -460,7 +460,7 @@ static int soc_camera_init_user_formats(struct soc_camera_device *icd)
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        unsigned int i, fmts = 0, raw_fmts = 0;
        int ret;
-       enum v4l2_mbus_pixelcode code;
+       u32 code;
 
        while (!v4l2_subdev_call(sd, video, enum_mbus_fmt, raw_fmts, &code))
                raw_fmts++;