Merge tag 'for-linus-20170825' of git://git.infradead.org/linux-mtd

[mirror_ubuntu-artful-kernel.git] / drivers / staging / media / atomisp / pci / atomisp2 / atomisp_internal.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h
index d3667132851bca6ce854c7c2014ce5ded1f23d6c..c8e0c4fe3717807b6a76df69ae1cfd3be566b1e6 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h
@@ -275,7 +275,7 @@ struct atomisp_device {
         */
        struct mutex streamoff_mutex;
 
-       int input_cnt;
+       unsigned int input_cnt;
        struct atomisp_input_subdev inputs[ATOM_ISP_MAX_INPUTS];
        struct v4l2_subdev *flash;
        struct v4l2_subdev *motor;