The patch titled
drivers/net/r6040.c: minor code cleanup
has been removed from the -mm tree. Its filename was
drivers-net-r6040c-minor-code-cleanup.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: drivers/net/r6040.c: minor code cleanup
From: Michael Opdenacker <michael@xxxxxxxxxxxxxxxxxx>
Replaced '0' by 'bar' in the probe function.
The 'bar' variable was already set to '0' and is already used in
pci_iomap(). This is cleaner and improves code consistency.
Signed-off-by: Michael Opdenacker <michael@xxxxxxxxxxxxxxxxxx>
Acked-by: Florian Fainelli <florian@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/r6040.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/net/r6040.c~drivers-net-r6040c-minor-code-cleanup drivers/net/r6040.c
--- a/drivers/net/r6040.c~drivers-net-r6040c-minor-code-cleanup
+++ a/drivers/net/r6040.c
@@ -1112,13 +1112,13 @@ static int __devinit r6040_init_one(stru
}
/* IO Size check */
- if (pci_resource_len(pdev, 0) < io_size) {
+ if (pci_resource_len(pdev, bar) < io_size) {
printk(KERN_ERR DRV_NAME ": Insufficient PCI resources, aborting\n");
err = -EIO;
goto err_out;
}
- pioaddr = pci_resource_start(pdev, 0); /* IO map base address */
+ pioaddr = pci_resource_start(pdev, bar); /* IO map base address */
pci_set_master(pdev);
dev = alloc_etherdev(sizeof(struct r6040_private));
_
Patches currently in -mm which might be from michael@xxxxxxxxxxxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
