aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDu, Alek <alek.du@intel.com>2011-07-07 15:16:48 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-04 21:58:40 -0700
commit569f3720370818fe5c9d69a11217602b89ae3908 (patch)
treed98a0c704b8ecda489ca0e26e6d386977ebd31d1
parent8cd3f19d8310dd5086f396f78d9b5bcf459f6e81 (diff)
n_gsm: fix the wrong FCS handling
commit f086ced17191fa0c5712539d2b680eae3dc972a1 upstream. FCS could be GSM0_SOF, so will break state machine... [This byte isn't quoted in any way so a SOF here doesn't imply an error occurred.] Signed-off-by: Alek Du <alek.du@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> [Trivial but best backported once its in 3.1rc I think] Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/tty/n_gsm.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 19b4ae052af..c0d34addc2d 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -1823,10 +1823,6 @@ static void gsm0_receive(struct gsm_mux *gsm, unsigned char c)
break;
case GSM_FCS: /* FCS follows the packet */
gsm->received_fcs = c;
- if (c == GSM0_SOF) {
- gsm->state = GSM_SEARCH;
- break;
- }
gsm_queue(gsm);
gsm->state = GSM_SSOF;
break;