Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[mv-sheeva.git] / drivers / media / radio / radio-maxiradio.c

diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index e5bfbd15820cbefe92ee6a1782d72acf1b5d5d3e..8e184cfc1c94aa897665f73e6a21fec40c26d973 100644 (file)
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -117,8 +117,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 +407,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;
        }