summaryrefslogtreecommitdiff
path: root/components/drivers
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2015-09-24 21:04:35 +0800
committerBernard Xiong <[email protected]>2015-09-24 21:04:35 +0800
commit5b77fa2d114c980a581f606cbf1cfe6bb06ba8b7 (patch)
tree1e97f61497adde8d119d72da83f39cd828f2c4ff /components/drivers
parent168bb7843f466abcda0d21cd198ce08d5f70b8e6 (diff)
parentd0dcdd11fe6ed42b853fb7b4ef0e91163c5f50ee (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'components/drivers')
-rw-r--r--components/drivers/serial/serial.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c
index f5a199e10b..3bae89c740 100644
--- a/components/drivers/serial/serial.c
+++ b/components/drivers/serial/serial.c
@@ -522,12 +522,10 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event)
rt_base_t level;
struct rt_serial_rx_fifo* rx_fifo;
+ /* interrupt mode receive */
rx_fifo = (struct rt_serial_rx_fifo*)serial->serial_rx;
RT_ASSERT(rx_fifo != RT_NULL);
-
- /* interrupt mode receive */
- RT_ASSERT(serial->parent.open_flag & RT_DEVICE_FLAG_INT_RX);
-
+
while (1)
{
ch = serial->ops->getc(serial);