summaryrefslogtreecommitdiffstats
path: root/drivers/tty
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-07-08 15:09:22 -0700
commitf086ced17191fa0c5712539d2b680eae3dc972a1 (patch)
tree5c306da57b0fc30aea3daee63fb38ab883326688 /drivers/tty
parentbff52fd458a1bca06266449b0ab8a43e9a50d240 (diff)
downloadblackbird-op-linux-f086ced17191fa0c5712539d2b680eae3dc972a1.tar.gz
blackbird-op-linux-f086ced17191fa0c5712539d2b680eae3dc972a1.zip
n_gsm: fix the wrong FCS handling
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> Cc: stable <stable@kernel.org> [3.0] [Trivial but best backported once its in 3.1rc I think] Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-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 a38114b01fea..14522ee8a91f 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -1871,10 +1871,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;
OpenPOWER on IntegriCloud