* [PATCH 02/18] char: mxser: call disable_pci_device() if pci_probe() failed
@ 2010-08-06 19:49 Kulikov Vasiliy
2010-08-08 20:29 ` Jiri Slaby
0 siblings, 1 reply; 2+ messages in thread
From: Kulikov Vasiliy @ 2010-08-06 19:49 UTC (permalink / raw)
To: kernel-janitors
Cc: Jiri Slaby, Greg Kroah-Hartman, Alan Cox, Andrew Morton,
Kulikov Vasiliy, linux-kernel
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@gmail.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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 02/18] char: mxser: call disable_pci_device() if pci_probe() failed
2010-08-06 19:49 [PATCH 02/18] char: mxser: call disable_pci_device() if pci_probe() failed Kulikov Vasiliy
@ 2010-08-08 20:29 ` Jiri Slaby
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Slaby @ 2010-08-08 20:29 UTC (permalink / raw)
To: Kulikov Vasiliy
Cc: kernel-janitors, Greg Kroah-Hartman, Alan Cox, Andrew Morton,
linux-kernel
On 08/06/2010 09:49 PM, Kulikov Vasiliy wrote:
> --- 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);
Why did you reorder this so that you cannot jump here from the fail path
above?
thanks,
--
js
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-08 20:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-06 19:49 [PATCH 02/18] char: mxser: call disable_pci_device() if pci_probe() failed Kulikov Vasiliy
2010-08-08 20:29 ` Jiri Slaby
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).