diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-09-25 21:41:14 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-22 00:37:49 +0200 |
| commit | df6a36fbef32cd7f27b9ce7da22ad16d0b4ed62c (patch) | |
| tree | 78b5e5b5e8f77cd32d0d1c439d51268fd80aaf11 /drivers | |
| parent | b0e55d5b5afae64d27c421243e5efbcb3e818649 (diff) | |
| download | u-boot-imx-df6a36fbef32cd7f27b9ce7da22ad16d0b4ed62c.zip u-boot-imx-df6a36fbef32cd7f27b9ce7da22ad16d0b4ed62c.tar.gz u-boot-imx-df6a36fbef32cd7f27b9ce7da22ad16d0b4ed62c.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/dc2114x.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 51e7c19..0fb616a 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"); |