Staging: speakup: Fix getting port information

PATCH In review Samuel Thibault 2 participants 2 messages Jan 5, 2016 Staging

Share & tools

Samuel Thibault

author

2016-01-05 01:19 UTC #0 lore raw

PATCH 1/1 Staging: speakup: Fix getting port information

Patch f79b0d9c223c ("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)

Signed-off-by Samuel Thibault <[email protected]>

Fixes f79b0d9c223c ("staging: speakup: Fixed warning <linux/serial.h> instead of <asm/serial.h>")

drivers/staging/speakup/serialio.c +10 -1

@@ -6,6 +6,9 @@
 #include "spk_priv.h"
 #include "serialio.h"
 
+#include <linux/serial_core.h>
+#include <asm/serial.h>
+
 #ifndef SERIAL_PORT_DFNS
 #define SERIAL_PORT_DFNS
 #endif

@@ -23,9 +26,15 @@ const struct old_serial_port *spk_serial
 	int baud = 9600, quot = 0;
 	unsigned int cval = 0;
 	int cflag = CREAD | HUPCL | CLOCAL | B9600 | CS8;
-	const struct old_serial_port *ser = rs_table + index;
+	const struct old_serial_port *ser;
 	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 */
 	quot = ser->baud_base / baud;
 	cval = cflag & (CSIZE | CSTOPB);

Dan Carpenter

2016-01-05 09:37 UTC #1 lore raw

drivers/staging/speakup/serialio.c line 11

Quoted 9 lines · Samuel Thibault

drivers/staging/speakup/serialio.c +3 -0

@@ -6,6 +6,9 @@
 #include "spk_priv.h"
 #include "serialio.h"
 
+#include <linux/serial_core.h>
+#include <asm/serial.h>
+

I'm sorry to do this but can you add a comment here, otherwise someone is going to just change it back because it causes a checkpatch.pl warning. Make it a big ugly warning.

#include <linux/serial_core.h>
/* WARNING: Do not change this to <linux/serial.h> without testing. */ #include <asm/serial.h>

regards,
dan carpenter