Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / media / radio / radio-maxiradio.c

diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index e5bfbd15820cbefe92ee6a1782d72acf1b5d5d3e..0133ecf3e040b0905f157581283c384f6ec7b876 100644 (file)
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -103,7 +103,9 @@ static const struct file_operations maxiradio_fops = {
        .open           = video_exclusive_open,
        .release        = video_exclusive_release,
        .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
        .compat_ioctl   = v4l_compat_ioctl32,
+#endif
        .llseek         = no_llseek,
 };
 
@@ -117,8 +119,10 @@ static struct radio_device
        unsigned long freq;
 
        struct mutex lock;
-} radio_unit = {0, 0, 0, 0, };
-
+} radio_unit = {
+       .muted =1,
+       .freq = FREQ_LO,
+};
 
 static void outbit(unsigned long bit, __u16 io)
 {
@@ -405,7 +409,7 @@ static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_d
        mutex_init(&radio_unit.lock);
        maxiradio_radio.priv = &radio_unit;
 
-       if(video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr)==-1) {
+       if (video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr)==-1) {
                printk("radio-maxiradio: can't register device!");
                goto err_out_free_region;
        }