Commit 69f5a5c8 authored by James Bottomley's avatar James Bottomley Committed by Linus Torvalds

[PATCH] fix smc-mca cleanup breakage

The latest set of smc-mca fixes broke the driver.  Apparently, it wasn't
realised that request_region() actually returns a pointer to the region
you're requesting if it can.  Without this fix, the smc-mca cannot
attach to any device.
parent da501825
...@@ -269,9 +269,10 @@ int __init ultramca_probe(struct device *gen_dev) ...@@ -269,9 +269,10 @@ int __init ultramca_probe(struct device *gen_dev)
goto err_unregister_netdev; goto err_unregister_netdev;
} }
rc = request_region(ioaddr, ULTRA_IO_EXTENT, dev->name); if (!request_region(ioaddr, ULTRA_IO_EXTENT, dev->name)) {
if (rc) rc = -ENODEV;
goto err_unregister_netdev; goto err_unregister_netdev;
}
reg4 = inb(ioaddr + 4) & 0x7f; reg4 = inb(ioaddr + 4) & 0x7f;
outb(reg4, ioaddr + 4); outb(reg4, ioaddr + 4);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment