summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2013-09-13 18:00:58 +0300
committerDavid S. Miller <davem@davemloft.net>2013-09-15 22:18:55 -0400
commitd2bb3905ab9bafebd0872ceef9466c32849429d7 (patch)
treec719faadb4d601875787e39cc1d7844d6f1a719c
parent35e4237973665c8a1ad4e3f7a7cb87573deaa24a (diff)
downloadop-kernel-dev-d2bb3905ab9bafebd0872ceef9466c32849429d7.zip
op-kernel-dev-d2bb3905ab9bafebd0872ceef9466c32849429d7.tar.gz
atm: nicstar: fix regression made by previous patch
The commit 8390f814 "atm: nicstar: re-use native mac_pton() helper" did a usefull thing. However, mac_pton() returns 1 in the case of the successfully parsed input. This patch fixes a typo. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/atm/nicstar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 409502a..5aca5f4 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -778,7 +778,7 @@ static int ns_init_card(int i, struct pci_dev *pcidev)
return error;
}
- if (mac[i] == NULL || mac_pton(mac[i], card->atmdev->esi)) {
+ if (mac[i] == NULL || !mac_pton(mac[i], card->atmdev->esi)) {
nicstar_read_eprom(card->membase, NICSTAR_EPROM_MAC_ADDR_OFFSET,
card->atmdev->esi, 6);
if (memcmp(card->atmdev->esi, "\x00\x00\x00\x00\x00\x00", 6) ==
OpenPOWER on IntegriCloud