]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
staging: speakup: fixed checkpatch and sparse warnings in selection.c
authorChris Yungmann <yungmann.chris@gmail.com>
Wed, 13 Jun 2012 16:39:55 +0000 (12:39 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Jun 2012 19:20:16 +0000 (12:20 -0700)
Signed-off-by: Chris Yungmann <yungmann.chris@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/speakup/selection.c

index fe1f405d5d70aaa333ac4ebabd49c545cec28990..0612df06a4bfd08d05499539d5adaa24853a51ad 100644 (file)
@@ -68,7 +68,7 @@ int speakup_set_selection(struct tty_struct *tty)
        if (spk_sel_cons != vc_cons[fg_console].d) {
                speakup_clear_selection();
                spk_sel_cons = vc_cons[fg_console].d;
-               printk(KERN_WARNING
+               dev_warn(tty->dev,
                        "Selection: mark console not the same as cut\n");
                return -EINVAL;
        }
@@ -95,7 +95,7 @@ int speakup_set_selection(struct tty_struct *tty)
        /* Allocate a new buffer before freeing the old one ... */
        bp = kmalloc((sel_end-sel_start)/2+1, GFP_ATOMIC);
        if (!bp) {
-               printk(KERN_WARNING "selection: kmalloc() failed\n");
+               dev_warn(tty->dev, "selection: kmalloc() failed\n");
                speakup_clear_selection();
                return -ENOMEM;
        }
@@ -141,7 +141,7 @@ int speakup_paste_selection(struct tty_struct *tty)
                count = sel_buffer_lth - pasted;
                count = min_t(int, count, tty->receive_room);
                tty->ldisc->ops->receive_buf(tty, sel_buffer + pasted,
-                       0, count);
+                       NULL, count);
                pasted += count;
        }
        remove_wait_queue(&vc->paste_wait, &wait);