[i2c] patch i2c-scx200_acb-handle-pci-errors.patch added to gregkh-2.6 tree

[gregkh at suse.de]

This is a note to let you know that I've just added the patch titled

     Subject: i2c: scx200_acb: Handle PCI errors

to my gregkh-2.6 tree.  Its filename is

     i2c-scx200_acb-handle-pci-errors.patch

This tree can be found at 
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/


>From khali at linux-fr.org Mon Oct 16 09:39:28 2006
Date: Mon, 16 Oct 2006 18:39:19 +0200
From: Jeff Garzik <jeff at garzik.org>
To: Greg KH <greg at kroah.com>
Cc: Linux I2C <i2c at lm-sensors.org>
Subject: i2c: scx200_acb: Handle PCI errors
Message-Id: <20061016183919.e4133ec6.khali at linux-fr.org>

From: Jeff Garzik <jeff at garzik.org>

scx200_acb: handle PCI errors

Signed-off-by: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 drivers/i2c/busses/scx200_acb.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- gregkh-2.6.orig/drivers/i2c/busses/scx200_acb.c
+++ gregkh-2.6/drivers/i2c/busses/scx200_acb.c
@@ -494,11 +494,12 @@ static __init int scx200_create_pci(cons
 	iface->pdev = pdev;
 	iface->bar = bar;
 
-	pci_enable_device_bars(iface->pdev, 1 << iface->bar);
+	rc = pci_enable_device_bars(iface->pdev, 1 << iface->bar);
+	if (rc)
+		goto errout_free;
 
 	rc = pci_request_region(iface->pdev, iface->bar, iface->adapter.name);
-
-	if (rc != 0) {
+	if (rc) {
 		printk(KERN_ERR NAME ": can't allocate PCI BAR %d\n",
 				iface->bar);
 		goto errout_free;


Patches currently in gregkh-2.6 which might be from jeff at garzik.org are

driver/howto-bug-report-addition.patch
driver/driver-core-bus-remove-indentation-level.patch
i2c/i2c-scx200_acb-handle-pci-errors.patch
pci/pci-delete-unused-extern-in-powermac-pci.c.patch
pci/pci-use-pci_generic_prep_mwi-on-sparc64.patch
pci/pci-replace-have_arch_pci_mwi-with-pci_disable_mwi.patch
pci/pci-use-pci_generic_prep_mwi-on-ia64.patch
usb/usb-gadget-net2280-handle-sysfs-errors.patch