mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kulikov Vasiliy <segooon@gmail.com>
To: kernel-janitors@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 04/18 v2] char: sx: call disable_pci_device() if pci_probe() failed
Date: Mon,  9 Aug 2010 23:49:35 +0400	[thread overview]
Message-ID: <1281383377-13657-1-git-send-email-segooon@gmail.com> (raw)

Driver should call disable_pci_device() if it returns from pci_probe()
with error.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
 drivers/char/sx.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 5b24db4..759563e 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2678,7 +2678,7 @@ static int __devinit sx_pci_probe(struct pci_dev *pdev,
 	retval = pci_request_region(pdev, reg, "sx");
 	if (retval) {
 		dev_err(&pdev->dev, "can't request region\n");
-		goto err_flag;
+		goto err_disable;
 	}
 	board->hw_base = pci_resource_start(pdev, reg);
 	board->base2 =
@@ -2711,6 +2711,8 @@ err_unmap:
 	iounmap(board->base2);
 err_reg:
 	pci_release_region(pdev, reg);
+err_disable:
+	pci_disable_device(pdev);
 err_flag:
 	board->flags &= ~SX_BOARD_PRESENT;
 err:
-- 
1.7.0.4


                 reply	other threads:[~2010-08-09 19:49 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1281383377-13657-1-git-send-email-segooon@gmail.com \
    --to=segooon@gmail.com \
    --cc=arnd@arndb.de \
    --cc=gregkh@suse.de \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome