summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-08-07 10:32:20 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2009-08-07 10:32:20 +0200
commit73dd04edca69ade43ea5604f1842feed69d35def (patch)
tree31ad36a04c23e9c3e262aead88d4487fb4d2bd90 /linux
parent731b07aacdb288bdc2e0d55090224470c064cac0 (diff)
downloadmediapointer-dvb-s2-73dd04edca69ade43ea5604f1842feed69d35def.tar.gz
mediapointer-dvb-s2-73dd04edca69ade43ea5604f1842feed69d35def.tar.bz2
pvrusb2: fix compile warning
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> CC: Mike Isely <isely@isely.net>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-audio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
index 42875ec21..d8c9e6632 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -66,9 +66,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];