[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1281124159-12671-1-git-send-email-segooon@gmail.com>
Date: Fri, 6 Aug 2010 23:49:17 +0400
From: Kulikov Vasiliy <segooon@...il.com>
To: kernel-janitors@...r.kernel.org
Cc: Jiri Slaby <jirislaby@...il.com>,
Greg Kroah-Hartman <gregkh@...e.de>,
Alan Cox <alan@...ux.intel.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Kulikov Vasiliy <segooon@...il.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH 02/18] char: mxser: call disable_pci_device() if pci_probe() failed
Driver should call disable_pci_device() if it returns from pci_probe()
with error. Also it must not be called if pci_request_region() fails as
it means that somebody uses device resources and rules the device.
Signed-off-by: Kulikov Vasiliy <segooon@...il.com>
---
drivers/char/mxser.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 3fc89da..3680eda 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -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;
+ }
brd->vector = ioaddress;
/* irq */
@@ -2616,10 +2619,11 @@ 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);
+ pci_release_region(pdev, 3);
+ pci_disable_device(pdev);
err:
return retval;
#else
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists