5 files changed, 13 insertions, 15 deletions

diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 9dfd8c70e4fb..2df0ce2afe98 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -4085,7 +4085,7 @@ static void __devinit avermedia_eeprom(struct bttv *btv)
 }
 
 /* used on Voodoo TV/FM (Voodoo 200), S0 wired to 0x10000 */
-void bttv_tda9880_setnorm(struct bttv *btv, int norm)
+void bttv_tda9880_setnorm(struct bttv *btv, unsigned int norm)
 {
         /* fix up our card entry */
         if(norm==V4L2_STD_NTSC) {
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index c71f394fc0ea..4ec476a9c0e4 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1277,7 +1277,7 @@ bttv_crop_calc_limits(struct bttv_crop *c)
 }
 
 static void
-bttv_crop_reset(struct bttv_crop *c, int norm)
+bttv_crop_reset(struct bttv_crop *c, unsigned int norm)
 {
         c->rect = bttv_tvnorms[norm].cropcap.defrect;
         bttv_crop_calc_limits(c);
@@ -1290,16 +1290,13 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
         const struct bttv_tvnorm *tvnorm;
         v4l2_std_id id;
 
-        if (norm < 0 || norm >= BTTV_TVNORMS)
-                return -EINVAL;
+        BUG_ON(norm >= BTTV_TVNORMS);
+        BUG_ON(btv->tvnorm >= BTTV_TVNORMS);
 
         tvnorm = &bttv_tvnorms[norm];
 
-        if (btv->tvnorm < 0 ||
-            btv->tvnorm >= BTTV_TVNORMS ||
-            0 != memcmp(&bttv_tvnorms[btv->tvnorm].cropcap,
-                        &tvnorm->cropcap,
-                        sizeof (tvnorm->cropcap))) {
+        if (!memcmp(&bttv_tvnorms[btv->tvnorm].cropcap, &tvnorm->cropcap,
+                    sizeof (tvnorm->cropcap))) {
                 bttv_crop_reset(&btv->crop[0], norm);
                 btv->crop[1] = btv->crop[0]; /* current = default */
 
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 6819e21a3773..e79a402fa6cd 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -411,7 +411,7 @@ int bttv_g_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt)
         return 0;
 }
 
-void bttv_vbi_fmt_reset(struct bttv_vbi_fmt *f, int norm)
+void bttv_vbi_fmt_reset(struct bttv_vbi_fmt *f, unsigned int norm)
 {
         const struct bttv_tvnorm *tvnorm;
         unsigned int real_samples_per_line;
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index a7bcad171823..b1986b94d29f 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -265,7 +265,7 @@ extern void bttv_init_card2(struct bttv *btv);
 
 /* card-specific funtions */
 extern void tea5757_set_freq(struct bttv *btv, unsigned short freq);
-extern void bttv_tda9880_setnorm(struct bttv *btv, int norm);
+extern void bttv_tda9880_setnorm(struct bttv *btv, unsigned int norm);
 
 /* extra tweaks for some chipsets */
 extern void bttv_check_chipset(void);
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 199a4d225caf..230e148e78fe 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -135,7 +135,7 @@ struct bttv_buffer {
 
         /* bttv specific */
         const struct bttv_format   *fmt;
-        int                        tvnorm;
+        unsigned int               tvnorm;
         int                        btformat;
         int                        btswap;
         struct bttv_geometry       geo;
@@ -154,7 +154,7 @@ struct bttv_buffer_set {
 };
 
 struct bttv_overlay {
-        int                    tvnorm;
+        unsigned int           tvnorm;
         struct v4l2_rect       w;
         enum v4l2_field        field;
         struct v4l2_clip       *clips;
@@ -174,7 +174,7 @@ struct bttv_vbi_fmt {
 };
 
 /* bttv-vbi.c */
-void bttv_vbi_fmt_reset(struct bttv_vbi_fmt *f, int norm);
+void bttv_vbi_fmt_reset(struct bttv_vbi_fmt *f, unsigned int norm);
 
 struct bttv_crop {
         /* A cropping rectangle in struct bttv_tvnorm.cropcap units. */
@@ -378,7 +378,8 @@ struct bttv {
         unsigned int audio;
         unsigned int mute;
         unsigned long freq;
-        int tvnorm,hue,contrast,bright,saturation;
+        unsigned int tvnorm;
+        int hue, contrast, bright, saturation;
         struct v4l2_framebuffer fbuf;
         unsigned int field_count;