From: Linus Walleij <linus.walleij@linaro.org>
Date: Sun, 25 Sep 2011 21:41:14 +0000 (+0000)
Subject: net: dc2114x: check for apropriate command
X-Git-Tag: v2011.12-rc1~501
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=df6a36fbef32cd7f27b9ce7da22ad16d0b4ed62c;p=u-boot

net: dc2114x: check for apropriate command

The code had two paths depending on whether the card was to be
accessed from plain memory or the IO region. However the error
path checks whether IO region was obtained - twice. Fix up the
error path according to the probable intention.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 51e7c19e03..0fb616ac20 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -245,15 +245,17 @@ int dc21x4x_initialize(bd_t *bis)
 		pci_write_config_word(devbusfn, PCI_COMMAND, status);
 
 		pci_read_config_word(devbusfn, PCI_COMMAND, &status);
+#ifdef CONFIG_TULIP_USE_IO
 		if (!(status & PCI_COMMAND_IO)) {
 			printf("Error: Can not enable I/O access.\n");
 			continue;
 		}
-
-		if (!(status & PCI_COMMAND_IO)) {
-			printf("Error: Can not enable I/O access.\n");
+#else
+		if (!(status & PCI_COMMAND_MEMORY)) {
+			printf("Error: Can not enable MEMORY access.\n");
 			continue;
 		}
+#endif
 
 		if (!(status & PCI_COMMAND_MASTER)) {
 			printf("Error: Can not enable Bus Mastering.\n");