From d8cc66f891525aa1a16d2dad27672a33d18bc4fa Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 28 Oct 2004 05:15:12 -0500 Subject: [PATCH] PCI: propagate pci_enable_device() errors From: Bjorn Helgaas 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 Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/misc/ibmasm/module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/misc/ibmasm/module.c') 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); -- cgit v1.2.3