]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
net: dc2114x: check for apropriate command
authorLinus Walleij <linus.walleij@linaro.org>
Sun, 25 Sep 2011 21:41:14 +0000 (21:41 +0000)
committerWolfgang Denk <wd@denx.de>
Fri, 21 Oct 2011 22:37:49 +0000 (00:37 +0200)
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>
drivers/net/dc2114x.c

index 51e7c19e03d418d26f9e6d5c9d6d2dc106b04b00..0fb616ac20bf85f94b28e23700bed4e9b77bbeba 100644 (file)
@@ -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");