* [PATCH] rtl818x_pci: Disable pci device in error handling code
@ 2016-01-13 14:29 Jia-Ju Bai
0 siblings, 0 replies; 5+ messages in thread
From: Jia-Ju Bai @ 2016-01-13 14:29 UTC (permalink / raw)
To: andrea.merello, Larry.Finger, flamingice, kvalo
Cc: linux-wireless, netdev, Jia-Ju Bai
When pci_request_regions in rtl8180_probe fails, pci_disable_device is not
called to disable the device which is enabled by pci_enbale_device.
This patch fixes the problem by adding a new lable in error handling code.
Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
---
drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
index a43a16f..c76af5d 100644
--- a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
@@ -1736,7 +1736,7 @@ static int rtl8180_probe(struct pci_dev *pdev,
if (err) {
printk(KERN_ERR "%s (rtl8180): Cannot obtain PCI resources\n",
pci_name(pdev));
- return err;
+ goto err_disable_dev;
}
io_addr = pci_resource_start(pdev, 0);
@@ -1938,6 +1938,8 @@ static int rtl8180_probe(struct pci_dev *pdev,
err_free_reg:
pci_release_regions(pdev);
+
+ err_disable_dev:
pci_disable_device(pdev);
return err;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] rtl818x_pci: Disable pci device in error handling code
@ 2016-01-30 16:19 ` Andrea Merello
0 siblings, 0 replies; 5+ messages in thread
From: Andrea Merello @ 2016-01-30 16:19 UTC (permalink / raw)
To: Jia-Ju Bai; +Cc: Larry Finger, Michael Wu, kvalo, Linux Wireless List, netdev
Acked-by: Andrea Merello <andrea.merello@gmail.com>
On Sat, Jan 16, 2016 at 2:02 PM, Jia-Ju Bai <baijiaju1990@163.com> wrote:
> When pci_request_regions in rtl8180_probe fails, pci_disable_device is not
> called to disable the device which is enabled by pci_enbale_device.
>
> This patch fixes the problem by adding a new lable in error handling code.
>
> Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
> ---
> drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
> index a43a16f..c76af5d 100644
> --- a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
> +++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
> @@ -1736,7 +1736,7 @@ static int rtl8180_probe(struct pci_dev *pdev,
> if (err) {
> printk(KERN_ERR "%s (rtl8180): Cannot obtain PCI resources\n",
> pci_name(pdev));
> - return err;
> + goto err_disable_dev;
> }
>
> io_addr = pci_resource_start(pdev, 0);
> @@ -1938,6 +1938,8 @@ static int rtl8180_probe(struct pci_dev *pdev,
>
> err_free_reg:
> pci_release_regions(pdev);
> +
> + err_disable_dev:
> pci_disable_device(pdev);
> return err;
> }
> --
> 1.7.9.5
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] rtl818x_pci: Disable pci device in error handling code
@ 2016-01-30 16:19 ` Andrea Merello
0 siblings, 0 replies; 5+ messages in thread
From: Andrea Merello @ 2016-01-30 16:19 UTC (permalink / raw)
To: Jia-Ju Bai
Cc: Larry Finger, Michael Wu, kvalo-sgV2jX0FEOL9JmXXK+q4OQ,
Linux Wireless List, netdev-u79uwXL29TY76Z2rM5mHXA
Acked-by: Andrea Merello <andrea.merello-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
On Sat, Jan 16, 2016 at 2:02 PM, Jia-Ju Bai <baijiaju1990-9Onoh4P/yGk@public.gmane.org> wrote:
> When pci_request_regions in rtl8180_probe fails, pci_disable_device is not
> called to disable the device which is enabled by pci_enbale_device.
>
> This patch fixes the problem by adding a new lable in error handling code.
>
> Signed-off-by: Jia-Ju Bai <baijiaju1990-9Onoh4P/yGk@public.gmane.org>
> ---
> drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
> index a43a16f..c76af5d 100644
> --- a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
> +++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
> @@ -1736,7 +1736,7 @@ static int rtl8180_probe(struct pci_dev *pdev,
> if (err) {
> printk(KERN_ERR "%s (rtl8180): Cannot obtain PCI resources\n",
> pci_name(pdev));
> - return err;
> + goto err_disable_dev;
> }
>
> io_addr = pci_resource_start(pdev, 0);
> @@ -1938,6 +1938,8 @@ static int rtl8180_probe(struct pci_dev *pdev,
>
> err_free_reg:
> pci_release_regions(pdev);
> +
> + err_disable_dev:
> pci_disable_device(pdev);
> return err;
> }
> --
> 1.7.9.5
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] rtl818x_pci: Disable pci device in error handling code
@ 2016-01-16 13:02 ` Jia-Ju Bai
0 siblings, 0 replies; 5+ messages in thread
From: Jia-Ju Bai @ 2016-01-16 13:02 UTC (permalink / raw)
To: andrea.merello, Larry.Finger, flamingice, kvalo
Cc: linux-wireless, netdev, Jia-Ju Bai
When pci_request_regions in rtl8180_probe fails, pci_disable_device is not
called to disable the device which is enabled by pci_enbale_device.
This patch fixes the problem by adding a new lable in error handling code.
Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
---
drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
index a43a16f..c76af5d 100644
--- a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
@@ -1736,7 +1736,7 @@ static int rtl8180_probe(struct pci_dev *pdev,
if (err) {
printk(KERN_ERR "%s (rtl8180): Cannot obtain PCI resources\n",
pci_name(pdev));
- return err;
+ goto err_disable_dev;
}
io_addr = pci_resource_start(pdev, 0);
@@ -1938,6 +1938,8 @@ static int rtl8180_probe(struct pci_dev *pdev,
err_free_reg:
pci_release_regions(pdev);
+
+ err_disable_dev:
pci_disable_device(pdev);
return err;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] rtl818x_pci: Disable pci device in error handling code
@ 2016-01-16 13:02 ` Jia-Ju Bai
0 siblings, 0 replies; 5+ messages in thread
From: Jia-Ju Bai @ 2016-01-16 13:02 UTC (permalink / raw)
To: andrea.merello-Re5JQEeQqe8AvxtiuMwx3w,
Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ,
flamingice-R9e9/4HEdknk1uMJSBkQmQ, kvalo-sgV2jX0FEOL9JmXXK+q4OQ
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, Jia-Ju Bai
When pci_request_regions in rtl8180_probe fails, pci_disable_device is not
called to disable the device which is enabled by pci_enbale_device.
This patch fixes the problem by adding a new lable in error handling code.
Signed-off-by: Jia-Ju Bai <baijiaju1990-9Onoh4P/yGk@public.gmane.org>
---
drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
index a43a16f..c76af5d 100644
--- a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
@@ -1736,7 +1736,7 @@ static int rtl8180_probe(struct pci_dev *pdev,
if (err) {
printk(KERN_ERR "%s (rtl8180): Cannot obtain PCI resources\n",
pci_name(pdev));
- return err;
+ goto err_disable_dev;
}
io_addr = pci_resource_start(pdev, 0);
@@ -1938,6 +1938,8 @@ static int rtl8180_probe(struct pci_dev *pdev,
err_free_reg:
pci_release_regions(pdev);
+
+ err_disable_dev:
pci_disable_device(pdev);
return err;
}
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-01-30 16:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-13 14:29 [PATCH] rtl818x_pci: Disable pci device in error handling code Jia-Ju Bai
2016-01-16 13:02 Jia-Ju Bai
2016-01-16 13:02 ` Jia-Ju Bai
2016-01-30 16:19 ` Andrea Merello
2016-01-30 16:19 ` Andrea Merello
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.