linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] pcmcia: pd6729: Fix error path
@ 2010-09-26 11:30 Rahul Ruikar
  2010-09-26 13:54 ` Dominik Brodowski
  0 siblings, 1 reply; 2+ messages in thread
From: Rahul Ruikar @ 2010-09-26 11:30 UTC (permalink / raw)
  To: linux, komurojun-mbn, w.sang, davem
  Cc: linux-pcmcia, linux-kernel, Rahul Ruikar

In error return path
call pci_disable_device() which was enabled earlier.

Signed-off-by: Rahul Ruikar <rahul.ruikar@gmail.com>
---
 drivers/pcmcia/pd6729.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index b8a869a..deef665 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -646,7 +646,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev,
 	if (!pci_resource_start(dev, 0)) {
 		dev_warn(&dev->dev, "refusing to load the driver as the "
 			"io_base is NULL.\n");
-		goto err_out_free_mem;
+		goto err_out_disable;
 	}
 
 	dev_info(&dev->dev, "Cirrus PD6729 PCI to PCMCIA Bridge at 0x%llx "
-- 
1.7.2.3


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] pcmcia: pd6729: Fix error path
  2010-09-26 11:30 [PATCH] pcmcia: pd6729: Fix error path Rahul Ruikar
@ 2010-09-26 13:54 ` Dominik Brodowski
  0 siblings, 0 replies; 2+ messages in thread
From: Dominik Brodowski @ 2010-09-26 13:54 UTC (permalink / raw)
  To: Rahul Ruikar; +Cc: komurojun-mbn, w.sang, davem, linux-pcmcia, linux-kernel

On Sun, Sep 26, 2010 at 05:00:29PM +0530, Rahul Ruikar wrote:
> In error return path
> call pci_disable_device() which was enabled earlier.
> 
> Signed-off-by: Rahul Ruikar <rahul.ruikar@gmail.com>

Applied, thanks!

	Dominik

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-09-26 14:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-26 11:30 [PATCH] pcmcia: pd6729: Fix error path Rahul Ruikar
2010-09-26 13:54 ` Dominik Brodowski

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).