From b6f5ffa9a857fa6770e0abbbfad81429a990655d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 24 Feb 2016 11:54:02 -0600 Subject: [PATCH] CDC/AC: too man right parentheses if IFLOW_CONTROL enabled --- configs | 2 +- drivers/usbhost/usbhost_cdcacm.c | 8 ++++---- fs/fat/Kconfig | 9 +++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/configs b/configs index 521652bd7f..b5ee355239 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit 521652bd7fcedc8c92e928fccb8c493f30456b59 +Subproject commit b5ee35523986bd879009b829723b1c85e1b4662e diff --git a/drivers/usbhost/usbhost_cdcacm.c b/drivers/usbhost/usbhost_cdcacm.c index ef00675627..0c35d61bf4 100644 --- a/drivers/usbhost/usbhost_cdcacm.c +++ b/drivers/usbhost/usbhost_cdcacm.c @@ -249,7 +249,7 @@ struct usbhost_cdcacm_s bool rxena; /* True: RX "interrupts" enabled */ #ifdef CONFIG_SERIAL_IFLOWCONTROL bool iflow; /* True: Input flow control (RTS) enabled */ - bool rts; /* True: Input flow control is effect */ + bool rts; /* True: Input flow control is in effect */ #endif #ifdef CONFIG_SERIAL_OFLOWCONTROL bool oflow; /* True: Output flow control (CTS) enabled */ @@ -2562,7 +2562,7 @@ static void usbhost_rxint(FAR struct uart_dev_s *uartdev, bool enable) */ #ifdef CONFIG_SERIAL_IFLOWCONTROL - if (priv->rts)) + if (priv->rts) #endif { ret = work_queue(LPWORK, &priv->rxwork, @@ -2654,7 +2654,7 @@ static bool usbhost_rxflowcontrol(FAR struct uart_dev_s *uartdev, * RTS. */ - priv ->rts = false; + priv->rts = false; /* Cancel any pending RX data reception work */ @@ -2668,7 +2668,7 @@ static bool usbhost_rxflowcontrol(FAR struct uart_dev_s *uartdev, * RTS. */ - priv ->rts = true; + priv->rts = true; /* Restart RX data reception work flow unless RX reception is * disabled. diff --git a/fs/fat/Kconfig b/fs/fat/Kconfig index d02b3d7304..1c20a9ddd1 100644 --- a/fs/fat/Kconfig +++ b/fs/fat/Kconfig @@ -97,6 +97,9 @@ config FAT_FORCE_INDIRECT N N N User memory can always be used for transfer. + * CONFIG_DIRECT_RETRY cannot be selected with CONFIG_FORCE_INDIRECT + ** CONFIG_DIRECT_RETRY is automatically selected with CONFIG_DMA_MEMORY + config FAT_DMAMEMORY bool "DMA memory allocator" default n @@ -129,6 +132,9 @@ config FAT_DMAMEMORY N N N User memory can always be used for transfer. + * CONFIG_DIRECT_RETRY cannot be selected with CONFIG_FORCE_INDIRECT + ** CONFIG_DIRECT_RETRY is automatically selected with CONFIG_DMA_MEMORY + config FAT_DIRECT_RETRY bool "Direct transfer retry" default y if FAT_DMAMEMORY @@ -171,4 +177,7 @@ config FAT_DIRECT_RETRY N N N User memory can always be used for transfer. + * CONFIG_DIRECT_RETRY cannot be selected with CONFIG_FORCE_INDIRECT + ** CONFIG_DIRECT_RETRY is automatically selected with CONFIG_DMA_MEMORY + endif # FAT