patch-2.4.2 linux/drivers/media/video/stradis.c

• Lines: 27
• Date: Fri Feb 9 11:30:23 2001
• Orig file: v2.4.1/linux/drivers/media/video/stradis.c
• Orig date: Fri Nov 17 17:56:51 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/media/video/stradis.c linux/drivers/media/video/stradis.c
@@ -26,7 +26,7 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/poll.h>
@@ -2067,11 +2067,15 @@
 	if (result == -EBUSY)
 		printk(KERN_ERR "stradis%d: IRQ %ld busy, change your PnP"
 		       " config in BIOS\n", num, saa->irq);
-	if (result < 0)
+	if (result < 0) {
+		iounmap(saa->saa7146_mem);
 		return result;
+	}
 	pci_set_master(dev);
-	if (video_register_device(&saa->video_dev, VFL_TYPE_GRABBER) < 0)
+	if (video_register_device(&saa->video_dev, VFL_TYPE_GRABBER) < 0) {
+		iounmap(saa->saa7146_mem);
 		return -1;
+	}
 #if 0
 	/* i2c generic interface is currently BROKEN */
 	i2c_register_bus(&saa->i2c);