aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/bt8xx/bttv-driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/bt8xx/bttv-driver.c')
-rw-r--r--drivers/media/pci/bt8xx/bttv-driver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 7aea24bf3a37..4b9a256f506e 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -1713,7 +1713,7 @@ static void radio_enable(struct bttv *btv)
1713 } 1713 }
1714} 1714}
1715 1715
1716static int bttv_s_std(struct file *file, void *priv, v4l2_std_id *id) 1716static int bttv_s_std(struct file *file, void *priv, v4l2_std_id id)
1717{ 1717{
1718 struct bttv_fh *fh = priv; 1718 struct bttv_fh *fh = priv;
1719 struct bttv *btv = fh->btv; 1719 struct bttv *btv = fh->btv;
@@ -1721,14 +1721,14 @@ static int bttv_s_std(struct file *file, void *priv, v4l2_std_id *id)
1721 int err = 0; 1721 int err = 0;
1722 1722
1723 for (i = 0; i < BTTV_TVNORMS; i++) 1723 for (i = 0; i < BTTV_TVNORMS; i++)
1724 if (*id & bttv_tvnorms[i].v4l2_id) 1724 if (id & bttv_tvnorms[i].v4l2_id)
1725 break; 1725 break;
1726 if (i == BTTV_TVNORMS) { 1726 if (i == BTTV_TVNORMS) {
1727 err = -EINVAL; 1727 err = -EINVAL;
1728 goto err; 1728 goto err;
1729 } 1729 }
1730 1730
1731 btv->std = *id; 1731 btv->std = id;
1732 set_tvnorm(btv, i); 1732 set_tvnorm(btv, i);
1733 1733
1734err: 1734err: