summaryrefslogtreecommitdiff
path: root/drivers/misc/ibmasm/module.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-10-28 05:15:12 -0500
committerGreg Kroah-Hartman <greg@kroah.com>2004-10-28 05:15:12 -0500
commitd8cc66f891525aa1a16d2dad27672a33d18bc4fa (patch)
tree707a9009681c8f92fefbd61cafbfd0fe78ba29be /drivers/misc/ibmasm/module.c
parent19e2d758dd30bc728da70c48fb40eec407315933 (diff)
[PATCH] PCI: propagate pci_enable_device() errors
From: Bjorn Helgaas <bjorn.helgaas@hp.com> Jeff Garzik pointed out that I should have propagated the error returned from pci_enable_device() rather than making up -ENODEV. Propagate pci_enable_device() error returns rather than using -ENODEV. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Diffstat (limited to 'drivers/misc/ibmasm/module.c')
-rw-r--r--drivers/misc/ibmasm/module.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index c5ca2206d800..eb7f13093c5f 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -59,13 +59,13 @@
static int __init ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
{
- int result = -ENOMEM;
+ int err, result = -ENOMEM;
struct service_processor *sp;
- if (pci_enable_device(pdev)) {
+ if ((err = pci_enable_device(pdev))) {
printk(KERN_ERR "%s: can't enable PCI device at %s\n",
DRIVER_NAME, pci_name(pdev));
- return -ENODEV;
+ return err;
}
sp = kmalloc(sizeof(struct service_processor), GFP_KERNEL);