diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-18 14:20:31 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-18 14:20:31 -0600 |
| commit | 36429f153857ff9c2f148411d4e45ddfb4d43e18 (patch) | |
| tree | 5f58f2154f5448f3186823de113e327c2332c0a7 | |
| parent | 99fcd931e29042c7a532674ff99c76daf3d3f68b (diff) | |
| download | nuttx-36429f153857ff9c2f148411d4e45ddfb4d43e18.tar.gz nuttx-36429f153857ff9c2f148411d4e45ddfb4d43e18.tar.bz2 nuttx-36429f153857ff9c2f148411d4e45ddfb4d43e18.zip | |
SAM EMAC: Fix typo in the check for successfull allocation of a timer
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_emac.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_emaca.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_emacb.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_gmac.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/README.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/sam34/sam_emac.c b/nuttx/arch/arm/src/sam34/sam_emac.c index c5df14f14..32d276007 100644 --- a/nuttx/arch/arm/src/sam34/sam_emac.c +++ b/nuttx/arch/arm/src/sam34/sam_emac.c @@ -3063,7 +3063,7 @@ void up_netinitialize(void) } priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txpoll) + if (!priv->txtimeout) { nlldbg("ERROR: Failed to create periodic poll timer\n"); goto errout_with_txpoll; diff --git a/nuttx/arch/arm/src/sama5/sam_emaca.c b/nuttx/arch/arm/src/sama5/sam_emaca.c index c6fbe1661..9fc65c2c0 100644 --- a/nuttx/arch/arm/src/sama5/sam_emaca.c +++ b/nuttx/arch/arm/src/sama5/sam_emaca.c @@ -3111,7 +3111,7 @@ int sam_emac_initialize(void) } priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txpoll) + if (!priv->txtimeout) { ndbg("ERROR: Failed to create periodic poll timer\n"); ret = -EAGAIN; diff --git a/nuttx/arch/arm/src/sama5/sam_emacb.c b/nuttx/arch/arm/src/sama5/sam_emacb.c index 946264fb6..8c705be06 100644 --- a/nuttx/arch/arm/src/sama5/sam_emacb.c +++ b/nuttx/arch/arm/src/sama5/sam_emacb.c @@ -3810,7 +3810,7 @@ int sam_emac_initialize(int intf) } priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txpoll) + if (!priv->txtimeout) { ndbg("ERROR: Failed to create periodic poll timer\n"); ret = -EAGAIN; diff --git a/nuttx/arch/arm/src/sama5/sam_gmac.c b/nuttx/arch/arm/src/sama5/sam_gmac.c index 6b90a1936..3a70c4b40 100644 --- a/nuttx/arch/arm/src/sama5/sam_gmac.c +++ b/nuttx/arch/arm/src/sama5/sam_gmac.c @@ -3183,7 +3183,7 @@ int sam_gmac_initialize(void) } priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txpoll) + if (!priv->txtimeout) { nlldbg("ERROR: Failed to create periodic poll timer\n"); ret = -EAGAIN; diff --git a/nuttx/configs/sama5d4-ek/README.txt b/nuttx/configs/sama5d4-ek/README.txt index 351fbfb08..3bb42515d 100644 --- a/nuttx/configs/sama5d4-ek/README.txt +++ b/nuttx/configs/sama5d4-ek/README.txt @@ -864,7 +864,7 @@ SAMA4D44-MB RevC PIO Usage ------------------------------ ------------------- ------------------------- PA0/LCDDAT0/TMS PA0 LCDDAT0, TMS PA1/LCDDAT1 PA1 LCDDAT1 - PA2/LCDDAT2/G1_TXCK PA LCDDAT2, G1_TXCK + PA2/LCDDAT2/G1_TXCK PA2 LCDDAT2, G1_TXCK PA3/LCDDAT3/G1_RXCK PA3 LCDDAT3 PA4/LCDDAT4/G1_TXEN PA4 LCDDAT4, G1_TXEN PA5/LCDDAT5/G1_TXER PA5 LCDDAT5 |