From 63ffdda697f8ad725416613abbf58ee5ccdd90c1 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 18 Nov 2006 22:19:39 -0800
Subject: [PATCH] --- yaml --- r: 41014 b: refs/heads/master c:
 ffb3d1348605816de10d4e57281e02f606508b6c h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/i2c/busses/scx200_acb.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3c71c4c6643e..025a9955acd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6cd2d94e1072a5756b5e5ab647d3223cba7e555
+refs/heads/master: ffb3d1348605816de10d4e57281e02f606508b6c
diff --git a/trunk/drivers/i2c/busses/scx200_acb.c b/trunk/drivers/i2c/busses/scx200_acb.c
index 32aab0d34ee9..714bae780953 100644
--- a/trunk/drivers/i2c/busses/scx200_acb.c
+++ b/trunk/drivers/i2c/busses/scx200_acb.c
@@ -494,11 +494,12 @@ static __init int scx200_create_pci(const char *text, struct pci_dev *pdev,
 	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;