Merge branch 'mrst-touchscreen' into next

[mv-sheeva.git] / drivers / char / n_gsm.c

diff --git a/drivers/char/n_gsm.c b/drivers/char/n_gsm.c
index e4089c432f15fea5964418cdf8d765e47f39bb50..04ef3ef0a422c5b6fae1e39284bb8e174d6a9dac 100644 (file)
--- a/drivers/char/n_gsm.c
+++ b/drivers/char/n_gsm.c
@@ -43,7 +43,6 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/tty.h>
-#include <linux/timer.h>
 #include <linux/ctype.h>
 #include <linux/mm.h>
 #include <linux/string.h>
@@ -920,7 +919,7 @@ static void gsm_dlci_data_sweep(struct gsm_mux *gsm)
                else
                        len = gsm_dlci_data_output_framed(gsm, dlci);
                if (len < 0)
-                       return;
+                       break;
                /* DLCI empty - try the next */
                if (len == 0)
                        i++;