From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: William Hubbs <w.d.hubbs@gmail.com>,
Chris Brannon <chris@the-brannons.com>,
Kirk Reiser <kirk@reisers.ca>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
speakup@linux-speakup.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] Staging: speakup: Fix getting port information
Date: Sun, 3 Jan 2016 00:25:29 +0100 [thread overview]
Message-ID: <20160102232529.GC2860@var.home> (raw)
5e6dc54 broke the port information in the speakup driver:
SERIAL_PORT_DFNS only gets defined if asm/serial.h is included.
Along the way, make sure that we do have information for the requested
serial port number (index)
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
--- a/drivers/staging/speakup/serialio.c
+++ b/drivers/staging/speakup/serialio.c
@@ -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
@@ -26,6 +29,11 @@ const struct old_serial_port *spk_serial
const struct old_serial_port *ser = rs_table + index;
int err;
+ if (index > sizeof(rs_table) / sizeof(*rs_table)) {
+ pr_info("no port info for ttyS%d\n", index);
+ return NULL;
+ }
+
/* Divisor, bytesize and parity */
quot = ser->baud_base / baud;
cval = cflag & (CSIZE | CSTOPB);
next reply other threads:[~2016-01-02 23:33 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-02 23:25 Samuel Thibault [this message]
2016-01-02 23:49 ` [PATCH] Staging: speakup: Fix getting port information Samuel Thibault
2016-01-03 0:10 ` covici
2016-01-03 0:56 ` Samuel Thibault
2016-01-03 1:31 ` covici
2016-01-04 12:22 ` Dan Carpenter
2016-01-04 12:26 ` Dan Carpenter
2016-01-04 12:20 ` Dan Carpenter
2016-01-05 1:14 ` Samuel Thibault
-- strict thread matches above, loose matches on Subject: below --
2016-01-05 1:19 Samuel Thibault
2016-01-05 9:36 ` Dan Carpenter
2016-01-14 23:47 Samuel Thibault
2016-01-15 5:59 ` Dan Carpenter
2016-01-25 0:29 ` Samuel Thibault
2016-01-25 2:52 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160102232529.GC2860@var.home \
--to=samuel.thibault@ens-lyon.org \
--cc=chris@the-brannons.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kirk@reisers.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=speakup@linux-speakup.org \
--cc=w.d.hubbs@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).