2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 1e97b3c12bd5..0c1b8520ef86 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -985,6 +985,9 @@ static int do_end_io(struct multipath *m, struct bio *bio,
         if (!error)
                 return 0;       /* I/O complete */
 
+        if ((error == -EWOULDBLOCK) && bio_rw_ahead(bio))
+                return error;
+
         spin_lock(&m->lock);
         if (!m->nr_valid_paths) {
                 if (!m->queue_if_no_path || m->suspended) {
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 22565a67a57c..98641c3f5ab9 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -197,7 +197,7 @@ static void
 sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs)
 {
         struct tty_struct *tty = sport->port.info->tty;
-        unsigned int status, ch, flg, ignored = 0;
+        unsigned int status, ch, flg;
 
         status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |
                  UTSR0_TO_SM(UART_GET_UTSR0(sport));