diff --git a/[refs] b/[refs] index 2671210635e8..fccdd7fa6109 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 199ab8fed4dcbe86dad74b6ed8733ff4c500e6df +refs/heads/master: 534d032601b1e274da0f0297c1312e79e56344a9 diff --git a/trunk/drivers/media/usb/usbvision/usbvision.h b/trunk/drivers/media/usb/usbvision/usbvision.h index 43cf61fe4943..8a25876d72c6 100644 --- a/trunk/drivers/media/usb/usbvision/usbvision.h +++ b/trunk/drivers/media/usb/usbvision/usbvision.h @@ -167,7 +167,7 @@ enum { /* This macro restricts an int variable to an inclusive range */ #define RESTRICT_TO_RANGE(v, mi, ma) \ - { if ((v) < (mi)) (v) = (mi); else if ((v) > (ma)) (v) = (ma); } + { if (((int)v) < (mi)) (v) = (mi); else if ((v) > (ma)) (v) = (ma); } /* * We use macros to do YUV -> RGB conversion because this is