Merge git://git.infradead.org/mtd-2.6

[sfrench/cifs-2.6.git] / drivers / media / video / stradis.c

diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 525d81288d55aada3b9308d871e1505a6d3edb11..3fb85af5d1f2b8ab45140661298a53062c920fb3 100644 (file)
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -1321,7 +1321,7 @@ static int saa_ioctl(struct inode *inode, struct file *file,
                        u32 format;
                        if (copy_from_user(&p, arg, sizeof(p)))
                                return -EFAULT;
-                       if (p.palette < sizeof(palette2fmt) / sizeof(u32)) {
+                       if (p.palette < ARRAY_SIZE(palette2fmt)) {
                                format = palette2fmt[p.palette];
                                saa->win.color_fmt = format;
                                saawrite(format | 0x60,
@@ -1901,7 +1901,7 @@ static int saa_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static struct file_operations saa_fops = {
+static const struct file_operations saa_fops = {
        .owner = THIS_MODULE,
        .open = saa_open,
        .release = saa_release,
@@ -1917,7 +1917,6 @@ static struct file_operations saa_fops = {
 static struct video_device saa_template = {
        .name = "SAA7146A",
        .type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY,
-       .hardware = VID_HARDWARE_SAA7146,
        .fops = &saa_fops,
        .minor = -1,
 };