summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArushi Singhal <arushisinghal19971997@gmail.com>2017-03-21 17:12:25 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-23 14:20:40 +0100
commit049aa51558fbfe79606efe961ae452a63ea6df08 (patch)
tree104c0ac3e5bc50f8f9e23eb74a888b18fb3e9b7a
parentad5a942f6c2055597192b31f9a92c47bf851f90d (diff)
downloadblackbird-op-linux-049aa51558fbfe79606efe961ae452a63ea6df08.tar.gz
blackbird-op-linux-049aa51558fbfe79606efe961ae452a63ea6df08.zip
staging: speakup: Moved logical to previous line.
Moved logical operator to previous line to fix the following checkpatch issue: CHECK: Logical continuations should be on the previous line. Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/speakup/main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index d890b9a864de..1ebe5cbdbb5a 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -902,8 +902,8 @@ static int get_sentence_buf(struct vc_data *vc, int read_punc)
while (start < end) {
sentbuf[bn][i] = get_char(vc, (u_short *)start, &tmp);
if (i > 0) {
- if (sentbuf[bn][i] == SPACE && sentbuf[bn][i - 1] == '.'
- && numsentences[bn] < 9) {
+ if (sentbuf[bn][i] == SPACE && sentbuf[bn][i - 1] == '.' &&
+ numsentences[bn] < 9) {
/* Sentence Marker */
numsentences[bn]++;
sentmarks[bn][numsentences[bn]] =
@@ -1300,8 +1300,8 @@ void spk_reset_default_chars(void)
/* First, free any non-default */
for (i = 0; i < 256; i++) {
- if ((spk_characters[i] != NULL)
- && (spk_characters[i] != spk_default_chars[i]))
+ if (spk_characters[i] &&
+ (spk_characters[i] != spk_default_chars[i]))
kfree(spk_characters[i]);
}
@@ -2096,8 +2096,8 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
tty = vc->port.tty;
if (type >= 0xf0)
type -= 0xf0;
- if (type == KT_PAD
- && (vt_get_leds(fg_console, VC_NUMLOCK))) {
+ if (type == KT_PAD &&
+ (vt_get_leds(fg_console, VC_NUMLOCK))) {
if (up_flag) {
spk_keydown = 0;
goto out;
OpenPOWER on IntegriCloud