1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index d5d7d6cf734a..1cd629380f71 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -35,7 +35,7 @@ static const char version[] = "0.24";
 #include <linux/usb.h>
 #include "se401.h"
 
-static int flickerless=0;
+static int flickerless;
 static int video_nr = -1;
 
 static struct usb_device_id device_table [] = {
@@ -300,10 +300,10 @@ static void se401_button_irq(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
+                dbg("%s - urb shutting down with status: %d", __func__, urb->status);
                 return;
         default:
-                dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
+                dbg("%s - nonzero urb status received: %d", __func__, urb->status);
                 goto exit;
         }
 
@@ -315,7 +315,7 @@ exit:
         status = usb_submit_urb (urb, GFP_ATOMIC);
         if (status)
                 err ("%s - usb_submit_urb failed with result %d",
-                     __FUNCTION__, status);
+                     __func__, status);
 }
 
 static void se401_video_irq(struct urb *urb)
@@ -1224,7 +1224,9 @@ static const struct file_operations se401_fops = {
         .read =         se401_read,
         .mmap =         se401_mmap,
         .ioctl =        se401_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .llseek =       no_llseek,
 };
 static struct video_device se401_template = {
@@ -1279,7 +1281,7 @@ static int se401_init(struct usb_se401 *se401, int button)
         rc=se401_sndctrl(0, se401, SE401_REQ_GET_HEIGHT, 0, cp, sizeof(cp));
         se401->cheight=cp[0]+cp[1]*256;
 
-        if (!cp[2] && SE401_FORMAT_BAYER) {
+        if (!(cp[2] & SE401_FORMAT_BAYER)) {
                 err("Bayer format not supported!");
                 return 1;
         }