|
@@ -1726,22 +1726,15 @@ static int bttv_s_std(struct file *file, void *priv, v4l2_std_id id)
|
|
struct bttv_fh *fh = priv;
|
|
struct bttv_fh *fh = priv;
|
|
struct bttv *btv = fh->btv;
|
|
struct bttv *btv = fh->btv;
|
|
unsigned int i;
|
|
unsigned int i;
|
|
- int err = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < BTTV_TVNORMS; i++)
|
|
for (i = 0; i < BTTV_TVNORMS; i++)
|
|
if (id & bttv_tvnorms[i].v4l2_id)
|
|
if (id & bttv_tvnorms[i].v4l2_id)
|
|
break;
|
|
break;
|
|
- if (i == BTTV_TVNORMS) {
|
|
|
|
- err = -EINVAL;
|
|
|
|
- goto err;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ if (i == BTTV_TVNORMS)
|
|
|
|
+ return -EINVAL;
|
|
btv->std = id;
|
|
btv->std = id;
|
|
set_tvnorm(btv, i);
|
|
set_tvnorm(btv, i);
|
|
-
|
|
|
|
-err:
|
|
|
|
-
|
|
|
|
- return err;
|
|
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
|
|
static int bttv_g_std(struct file *file, void *priv, v4l2_std_id *id)
|
|
static int bttv_g_std(struct file *file, void *priv, v4l2_std_id *id)
|
|
@@ -1770,12 +1763,9 @@ static int bttv_enum_input(struct file *file, void *priv,
|
|
{
|
|
{
|
|
struct bttv_fh *fh = priv;
|
|
struct bttv_fh *fh = priv;
|
|
struct bttv *btv = fh->btv;
|
|
struct bttv *btv = fh->btv;
|
|
- int rc = 0;
|
|
|
|
|
|
|
|
- if (i->index >= bttv_tvcards[btv->c.type].video_inputs) {
|
|
|
|
- rc = -EINVAL;
|
|
|
|
- goto err;
|
|
|
|
- }
|
|
|
|
|
|
+ if (i->index >= bttv_tvcards[btv->c.type].video_inputs)
|
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
i->type = V4L2_INPUT_TYPE_CAMERA;
|
|
i->type = V4L2_INPUT_TYPE_CAMERA;
|
|
i->audioset = 0;
|
|
i->audioset = 0;
|
|
@@ -1799,10 +1789,7 @@ static int bttv_enum_input(struct file *file, void *priv,
|
|
}
|
|
}
|
|
|
|
|
|
i->std = BTTV_NORMS;
|
|
i->std = BTTV_NORMS;
|
|
-
|
|
|
|
-err:
|
|
|
|
-
|
|
|
|
- return rc;
|
|
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
|
|
static int bttv_g_input(struct file *file, void *priv, unsigned int *i)
|
|
static int bttv_g_input(struct file *file, void *priv, unsigned int *i)
|