From: Mark Allyn <mark.a.allyn@intel.com>
To: linux-kernel@vger.kernel.org, greg@kroah.com,
mark.a.allyn@intel.com, alan@linux.intel.com,
dmitry.kasatkin@nokia.com
Subject: [PATCH 04/11] sep: clean up error checking in probe function
Date: Thu, 9 Dec 2010 09:31:18 -0800 [thread overview]
Message-ID: <1291915878-18430-1-git-send-email-mark.a.allyn@intel.com> (raw)
Add pci_disable
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
---
drivers/staging/sep/sep_driver.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index 241b1b1..821d3b7 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -3437,7 +3437,8 @@ static int __devinit sep_probe(struct pci_dev *pdev,
if (sep_dev == NULL) {
dev_warn(&pdev->dev,
"can't kmalloc the sep_device structure\n");
- return -ENOMEM;
+ error = -ENOMEM;
+ goto end_function_disable_device;
}
/*
@@ -3448,7 +3449,7 @@ static int __devinit sep_probe(struct pci_dev *pdev,
*/
sep = sep_dev;
- sep->pdev = pdev;
+ sep->pdev = pci_dev_get(pdev);
init_waitqueue_head(&sep->event);
init_waitqueue_head(&sep->event_request_daemon);
@@ -3466,23 +3467,23 @@ static int __devinit sep_probe(struct pci_dev *pdev,
sep->reg_physical_addr = pci_resource_start(sep->pdev, 0);
if (!sep->reg_physical_addr) {
dev_warn(&sep->pdev->dev, "Error getting register start\n");
- pci_dev_put(sep->pdev);
- return -ENODEV;
+ error = -ENODEV;
+ goto end_function_free_sep_dev;
}
sep->reg_physical_end = pci_resource_end(sep->pdev, 0);
if (!sep->reg_physical_end) {
dev_warn(&sep->pdev->dev, "Error getting register end\n");
- pci_dev_put(sep->pdev);
- return -ENODEV;
+ error = -ENODEV;
+ goto end_function_free_sep_dev;
}
sep->reg_addr = ioremap_nocache(sep->reg_physical_addr,
(size_t)(sep->reg_physical_end - sep->reg_physical_addr + 1));
if (!sep->reg_addr) {
dev_warn(&sep->pdev->dev, "Error getting register virtual\n");
- pci_dev_put(sep->pdev);
- return -ENODEV;
+ error = -ENODEV;
+ goto end_function_free_sep_dev;
}
dev_dbg(&sep->pdev->dev,
@@ -3573,9 +3574,15 @@ end_function_deallocate_sep_shared_area:
end_function_error:
iounmap(sep->reg_addr);
+
+end_function_free_sep_dev:
+ pci_dev_put(sep_dev->pdev);
kfree(sep_dev);
sep_dev = NULL;
+end_function_disable_device:
+ pci_disable_device(pdev);
+
end_function:
return error;
}
--
1.6.3.3
reply other threads:[~2010-12-09 17:24 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=1291915878-18430-1-git-send-email-mark.a.allyn@intel.com \
--to=mark.a.allyn@intel.com \
--cc=alan@linux.intel.com \
--cc=dmitry.kasatkin@nokia.com \
--cc=greg@kroah.com \
--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
all inboxes | Powered by JetHome®