diff options
| author |   Hans Verkuil <hverkuil@xs4all.nl> | 2009-08-07 05:32:20 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-12 12:18:49 -0300 |
| commit | f19b56a8eb54d758bff94ae6a1b4f79335155238 (patch) | |
| tree | 6d20d6c2587ef4e2fbc71d945c0790479a8fa2bb /drivers/media/video/pvrusb2 | |
| parent | V4L/DVB (12423): cxusb, d680 dmbth use unified lgs8gxx code instead of lgs8gl5 (diff) | |
| download | linux-dev-f19b56a8eb54d758bff94ae6a1b4f79335155238.tar.xz linux-dev-f19b56a8eb54d758bff94ae6a1b4f79335155238.zip | |
V4L/DVB (12426): pvrusb2: fix compile warning
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Acked-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pvrusb2')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-audio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c index 416933ca607d..cc06d5e4adcc 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-audio.c +++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c @@ -65,9 +65,10 @@ void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) u32 input; pvr2_trace(PVR2_TRACE_CHIPS, "subdev msp3400 v4l2 set_stereo"); + sp = (sid < ARRAY_SIZE(routing_schemes)) ? + routing_schemes[sid] : NULL; - if ((sid < ARRAY_SIZE(routing_schemes)) && - ((sp = routing_schemes[sid]) != NULL) && + if ((sp != NULL) && (hdw->input_val >= 0) && (hdw->input_val < sp->cnt)) { input = sp->def[hdw->input_val]; |