From a27a431ec0b599754266dfa4ce069449de1bd1b0 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 17 Apr 2014 09:02:55 -0600 Subject: SAMA5 EMAC: Missing right parens from last change. Noted by Luciano Neri --- nuttx/ChangeLog | 12 ++++++++---- nuttx/arch/arm/src/sama5/sam_emac.c | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'nuttx') diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 2122fa019..29e8c7792 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -7179,7 +7179,11 @@ Duckworth (2014-4-16). * arch/arm/src/stm32/chip/stm32f20xxx_pinmap.h: Correct a mapping for SPI MOSI pin. From dlsitzer (2014-4-26). - * arm/src/sama5/sam_clockconfig.c/.h: Move the un-definitions of - __ramfuncs__ from the .c file to the .h file or, otherwise, the - attribute will be applied differently for the prototype and the - function definition. Sourceforge patch 38 from Luciano Neri (2014-4-17). + * arm/src/sama5/sam_clockconfig.c and common/up_internal.h: Move the + un-definitions of __ramfuncs__ from the .c file to the .h file or, + otherwise, the attribute will be applied differently for the prototype + and the function definition. Sourceforge patch 38 from Luciano Neri + (2014-4-17). + * arch/arm/src/sama5/sam_emac.c: Add missing right parentheses. This + introduced in the above change and is Sourceforge patch 39 from Luciano + Neri (2014-4-17). diff --git a/nuttx/arch/arm/src/sama5/sam_emac.c b/nuttx/arch/arm/src/sama5/sam_emac.c index 2f2603cb5..b20446ec7 100644 --- a/nuttx/arch/arm/src/sama5/sam_emac.c +++ b/nuttx/arch/arm/src/sama5/sam_emac.c @@ -2484,15 +2484,15 @@ static int sam_phyinit(struct sam_emac_s *priv) ndbg("ERROR: Cannot realize PHY clock\n"); return -EINVAL; } - else if (mck > (80*1000*1000) + else if (mck > (80*1000*1000)) { regval |= EMAC_NCFGR_CLK_DIV64; /* MCK divided by 64 (MCK up to 160 MHz) */ } - else if (mck > (40*1000*1000) + else if (mck > (40*1000*1000)) { regval |= EMAC_NCFGR_CLK_DIV32; /* MCK divided by 32 (MCK up to 80 MHz) */ } - else if (mck > (20*1000*1000) + else if (mck > (20*1000*1000)) { regval |= EMAC_NCFGR_CLK_DIV16; /* MCK divided by 16 (MCK up to 40 MHz) */ } -- cgit v1.2.3