Commit 78e4be16 authored by Amol Lad's avatar Amol Lad Committed by David S. Miller
Browse files

[ATM]: [drivers] ioremap balanced with iounmap 



Signed-off-by: default avatarAmol Lad <amol@verismonetworks.com>
Signed-off-by: default avatarchas williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de24a193

drivers/atm/eni.c

+15 −4
Original line number Diff line number Diff line
@@ -1738,7 +1738,8 @@ static int __devinit eni_do_init(struct atm_dev *dev) 
			printk(KERN_ERR KERN_ERR DEV_LABEL "(itf %d): bad "

			    "magic - expected 0x%x, got 0x%x\n",dev->number,

			    ENI155_MAGIC,(unsigned) readl(&eprom->magic));

			return -EINVAL;

			error = -EINVAL;

			goto unmap;

		}

	}

	eni_dev->phy = base+PHY_BASE;
@@ -1765,17 +1766,27 @@ static int __devinit eni_do_init(struct atm_dev *dev) 
		printk(")\n");

		printk(KERN_ERR DEV_LABEL "(itf %d): ERROR - wrong id 0x%x\n",

		    dev->number,(unsigned) eni_in(MID_RES_ID_MCON));

		return -EINVAL;

		error = -EINVAL;

		goto unmap;

	}

	error = eni_dev->asic ? get_esi_asic(dev) : get_esi_fpga(dev,base);

	if (error) return error;

	if (error)

		goto unmap;

	for (i = 0; i < ESI_LEN; i++)

		printk("%s%02X",i ? "-" : "",dev->esi[i]);

	printk(")\n");

	printk(KERN_NOTICE DEV_LABEL "(itf %d): %s,%s\n",dev->number,

	    eni_in(MID_RES_ID_MCON) & 0x200 ? "ASIC" : "FPGA",

	    media_name[eni_in(MID_RES_ID_MCON) & DAUGTHER_ID]);

	return suni_init(dev);



	error = suni_init(dev);

	if (error)

		goto unmap;

out:

	return error;

unmap:

	iounmap(base);

	goto out;

}

drivers/atm/firestream.c

+9 −5
Original line number Diff line number Diff line
@@ -1710,7 +1710,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
		/* This bit is documented as "RESERVED" */

		if (isr & ISR_INIT_ERR) {

			printk (KERN_ERR "Error initializing the FS... \n");

			return 1;

			goto unmap;

		}

		if (isr & ISR_INIT) {

			fs_dprintk (FS_DEBUG_INIT, "Ha! Initialized OK!\n");
@@ -1723,7 +1723,7 @@ static int __devinit fs_init (struct fs_dev *dev) 


	if (!to) {

		printk (KERN_ERR "timeout initializing the FS... \n");

		return 1;

		goto unmap;

	}



	/* XXX fix for fs155 */
@@ -1803,7 +1803,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
	if (!dev->atm_vccs) {

		printk (KERN_WARNING "Couldn't allocate memory for VCC buffers. Woops!\n");

		/* XXX Clean up..... */

		return 1;

		goto unmap;

	}



	dev->tx_inuse = kzalloc (dev->nchannels / 8 /* bits/byte */ , GFP_KERNEL);
@@ -1813,7 +1813,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
	if (!dev->tx_inuse) {

		printk (KERN_WARNING "Couldn't allocate memory for tx_inuse bits!\n");

		/* XXX Clean up..... */

		return 1;

		goto unmap;

	}

	/* -- RAS1 : FS155 and 50 differ. Default (0) should be OK for both */

	/* -- RAS2 : FS50 only: Default is OK. */
@@ -1840,7 +1840,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
	if (request_irq (dev->irq, fs_irq, IRQF_SHARED, "firestream", dev)) {

		printk (KERN_WARNING "couldn't get irq %d for firestream.\n", pci_dev->irq);

		/* XXX undo all previous stuff... */

		return 1;

		goto unmap;

	}

	fs_dprintk (FS_DEBUG_INIT, "Grabbed irq %d for dev at %p.\n", dev->irq, dev);
@@ -1890,6 +1890,9 @@ static int __devinit fs_init (struct fs_dev *dev) 
  

	func_exit ();

	return 0;

unmap:

	iounmap(dev->base);

	return 1;

}



static int __devinit firestream_init_one (struct pci_dev *pci_dev,
@@ -2012,6 +2015,7 @@ static void __devexit firestream_remove_one (struct pci_dev *pdev) 
		for (i=0;i < FS_NR_RX_QUEUES;i++)

			free_queue (dev, &dev->rx_rq[i]);



		iounmap(dev->base);

		fs_dprintk (FS_DEBUG_ALLOC, "Free fs-dev: %p\n", dev);

		nxtdev = dev->next;

		kfree (dev);