patch-2.4.2 linux/drivers/media/video/zr36120.c
Next file: linux/drivers/mtd/cfi_cmdset_0001.c
Previous file: linux/drivers/media/video/tvmixer.c
Back to the patch index
Back to the overall index
- Lines: 28
- Date:
Fri Feb 9 11:30:23 2001
- Orig file:
v2.4.1/linux/drivers/media/video/zr36120.c
- Orig date:
Fri Nov 17 17:56:52 2000
diff -u --recursive --new-file v2.4.1/linux/drivers/media/video/zr36120.c linux/drivers/media/video/zr36120.c
@@ -25,7 +25,7 @@
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/major.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <linux/pci.h>
@@ -1866,14 +1866,16 @@
SA_SHIRQ|SA_INTERRUPT,"zoran",(void *)ztv);
if (result==-EINVAL)
{
+ iounmap(ztv->zoran_mem);
printk(KERN_ERR "zoran: Bad irq number or handler\n");
return -EINVAL;
}
if (result==-EBUSY)
printk(KERN_ERR "zoran: IRQ %d busy, change your PnP config in BIOS\n",dev->irq);
- if (result < 0)
+ if (result < 0) {
+ iounmap(ztv->zoran_mem);
return result;
-
+ }
/* Enable bus-mastering */
pci_set_master(dev);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)