Merge branch 'for-linus' of git://www.jni.nu/cris

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

diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 8e33a19a22a3134c16109d60ebd5bff971ec6056..bddd3c409aa95a84112b1930ea0844ab060b4150 100644 (file)
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -100,7 +100,9 @@ static const struct file_operations maestro_fops = {
        .open           = video_exclusive_open,
        .release        = video_exclusive_release,
        .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
        .compat_ioctl   = v4l_compat_ioctl32,
+#endif
        .llseek         = no_llseek,
 };
 
@@ -423,7 +425,7 @@ static int __devinit maestro_probe(struct pci_dev *pdev,
 errunr:
        video_unregister_device(maestro_radio_inst);
 errfr1:
-       kfree(maestro_radio_inst);
+       video_device_release(maestro_radio_inst);
 errfr:
        kfree(radio_unit);
 err: