diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-11-19 01:19:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-20 12:42:05 -0500 |
| commit | ffb3d1348605816de10d4e57281e02f606508b6c (patch) | |
| tree | 60f4962a9f864d169961157cf00da6590a5e59a9 /drivers/i2c | |
| parent | a6cd2d94e1072a5756b5e5ab647d3223cba7e555 (diff) | |
[PATCH] scx200_acb: handle PCI errors
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/scx200_acb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c index 32aab0d34ee9..714bae780953 100644 --- a/drivers/i2c/busses/scx200_acb.c +++ b/drivers/i2c/busses/scx200_acb.c | |||
| @@ -494,11 +494,12 @@ static __init int scx200_create_pci(const char *text, struct pci_dev *pdev, | |||
| 494 | iface->pdev = pdev; | 494 | iface->pdev = pdev; |
| 495 | iface->bar = bar; | 495 | iface->bar = bar; |
| 496 | 496 | ||
| 497 | pci_enable_device_bars(iface->pdev, 1 << iface->bar); | 497 | rc = pci_enable_device_bars(iface->pdev, 1 << iface->bar); |
| 498 | if (rc) | ||
| 499 | goto errout_free; | ||
| 498 | 500 | ||
| 499 | rc = pci_request_region(iface->pdev, iface->bar, iface->adapter.name); | 501 | rc = pci_request_region(iface->pdev, iface->bar, iface->adapter.name); |
| 500 | 502 | if (rc) { | |
| 501 | if (rc != 0) { | ||
| 502 | printk(KERN_ERR NAME ": can't allocate PCI BAR %d\n", | 503 | printk(KERN_ERR NAME ": can't allocate PCI BAR %d\n", |
| 503 | iface->bar); | 504 | iface->bar); |
| 504 | goto errout_free; | 505 | goto errout_free; |