evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: speakup: Fix getting port information

Browse source 
commit 327b882d3bcc1fba82dbd39b5cf5a838c81218e2 upstream.

Commit f79b0d9c22 ("staging: speakup: Fixed warning <linux/serial.h>
instead of <asm/serial.h>") broke the port information in the speakup
driver: SERIAL_PORT_DFNS only gets defined if asm/serial.h is included,
and no other header includes asm/serial.h.

We here make sure serialio.c does get the arch-specific definition of
SERIAL_PORT_DFNS from asm/serial.h, if any.

Along the way, this makes sure that we do have information for the
requested serial port number (index)

Fixes: f79b0d9c22 ("staging: speakup: Fixed warning <linux/serial.h> instead of <asm/serial.h>")
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Samuel Thibault 2016-01-15 00:47:41 +01:00 • committed by Greg Kroah-Hartman
parent f313f1d809
commit 16d9f52201
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/staging/speakup/serialio.c
View file

@ -6,6 +6,11 @@
#include "spk_priv.h" #include "spk_priv.h"
#include "serialio.h" #include "serialio.h"
#include <linux/serial_core.h>
/* WARNING: Do not change this to <linux/serial.h> without testing that
* SERIAL_PORT_DFNS does get defined to the appropriate value. */
#include <asm/serial.h>
#ifndef SERIAL_PORT_DFNS #ifndef SERIAL_PORT_DFNS
#define SERIAL_PORT_DFNS #define SERIAL_PORT_DFNS
#endif #endif
@ -23,9 +28,15 @@ const struct old_serial_port *spk_serial_init(int index)
int baud = 9600, quot = 0; int baud = 9600, quot = 0;
unsigned int cval = 0; unsigned int cval = 0;
int cflag = CREAD | HUPCL | CLOCAL | B9600 | CS8; int cflag = CREAD | HUPCL | CLOCAL | B9600 | CS8;
const struct old_serial_port *ser = rs_table + index; const struct old_serial_port *ser;
int err; int err;
if (index >= ARRAY_SIZE(rs_table)) {
pr_info("no port info for ttyS%d\n", index);
return NULL;
}
ser = rs_table + index;
/* Divisor, bytesize and parity */ /* Divisor, bytesize and parity */
quot = ser->baud_base / baud; quot = ser->baud_base / baud;
cval = cflag & (CSIZE | CSTOPB); cval = cflag & (CSIZE | CSTOPB);