diff --git a/[refs] b/[refs] index 62bf9f165eda..23e4537a938a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ea05db06f32adac65b4c4e95ef998839149de12 +refs/heads/master: f7232056bff5fe2d3bfeab35252a66ebaeb5bbde diff --git a/trunk/drivers/serial/mpsc.c b/trunk/drivers/serial/mpsc.c index efe79b1fd431..aec83f577ce6 100644 --- a/trunk/drivers/serial/mpsc.c +++ b/trunk/drivers/serial/mpsc.c @@ -1100,6 +1100,8 @@ mpsc_start_rx(struct mpsc_port_info *pi) { pr_debug("mpsc_start_rx[%d]: Starting...\n", pi->port.line); + /* Issue a Receive Abort to clear any receive errors */ + writel(MPSC_CHR_2_RA, pi->mpsc_base + MPSC_CHR_2); if (pi->rcv_data) { mpsc_enter_hunt(pi); mpsc_sdma_cmd(pi, SDMA_SDCM_ERD);