Merge branch 'linus' into x86/cleanups

[linux-2.6-omap-h63xx.git] / drivers / media / video / pvrusb2 / pvrusb2-video-v4l.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index 7c47345501b610ea988f349f935de29666415193..4059648c70563341844c90697a79f03782b37ec2 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -81,7 +80,7 @@ static void set_input(struct pvr2_v4l_decoder *ctxt)
        pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_input(%d)",hdw->input_val);
 
        if ((sid < ARRAY_SIZE(routing_schemes)) &&
-           ((sp = routing_schemes + sid) != 0) &&
+           ((sp = routing_schemes + sid) != NULL) &&
            (hdw->input_val >= 0) &&
            (hdw->input_val < sp->cnt)) {
                route.input = sp->def[hdw->input_val];