summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-11-29 16:42:44 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-11-29 16:42:44 -0600
commit3e5decd40caac82f335d41574a90f24ec49a13a1 (patch)
treeaef78844ebd0eb8bb0f3eb281afbad7b17df891e
parent4af5b7afdfc064c1541b574f98ee7ed718bce129 (diff)
downloadpx4-nuttx-3e5decd40caac82f335d41574a90f24ec49a13a1.tar.gz
px4-nuttx-3e5decd40caac82f335d41574a90f24ec49a13a1.tar.bz2
px4-nuttx-3e5decd40caac82f335d41574a90f24ec49a13a1.zip
SAMA5 EHCI: Fix case when interrupt endpoints enabled
-rwxr-xr-xnuttx/arch/arm/src/sama5/sam_ehci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/sama5/sam_ehci.c b/nuttx/arch/arm/src/sama5/sam_ehci.c
index 4c96ca6be..b53e0c798 100755
--- a/nuttx/arch/arm/src/sama5/sam_ehci.c
+++ b/nuttx/arch/arm/src/sama5/sam_ehci.c
@@ -4182,7 +4182,7 @@ FAR struct usbhost_connection_s *sam_ehci_initialize(int controller)
}
#endif
-#if !defined(CONFIG_SAMA5_EHCI_PREALLOCATE) || !defined(CONFIG_USBHOST_INT_DISABLE)
+#if !defined(CONFIG_SAMA5_EHCI_PREALLOCATE) && !defined(CONFIG_USBHOST_INT_DISABLE)
/* Allocate the periodic framelist */
g_framelist = (uint32_t *)