Prev: [PATCH v2 1/1] Char: mxser, call pci_disable_device from probe/remove
Next: [GIT PULL] MSM video fixes for v2.6.36
From: Dan Carpenter on 9 Aug 2010 16:30
On Mon, Aug 09, 2010 at 11:49:27PM +0400, Kulikov Vasiliy wrote:
> @@ -2564,8 +2564,11 @@ static int __devinit mxser_probe(struct pci_dev *pdev,
> /* vector */
> ioaddress = pci_resource_start(pdev, 3);
> retval = pci_request_region(pdev, 3, "mxser(vector)");
> - if (retval)
> - goto err_relio;
> + if (retval) {
> + pci_release_region(pdev, 2);
> + brd->info = NULL;
> + goto err_release;

This should just be goto err_null. The original err_null had a bug that
it didn't call pci_release_region(pdev, 2); but you already fixed that.

regards,
dan carpenter

> + }
> brd->vector = ioaddress;
>
> /* irq */
> @@ -2616,10 +2619,13 @@ static int __devinit mxser_probe(struct pci_dev *pdev,
> pci_set_drvdata(pdev, brd);
>
> return 0;
> -err_relio:
> - pci_release_region(pdev, 2);
> err_null:
> brd->info = NULL;
> + pci_release_region(pdev, 2);
> +err_release:
> + pci_release_region(pdev, 3);
> +err_disable:
> + pci_disable_device(pdev);
> err:
> return retval;
> #else

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH v2 1/1] Char: mxser, call pci_disable_device from probe/remove
Next: [GIT PULL] MSM video fixes for v2.6.36