From b3de571116265ff8f1ccb17709282bc866d9f9c5 Mon Sep 17 00:00:00 2001 From: Chris Yungmann Date: Wed, 13 Jun 2012 12:39:55 -0400 Subject: [PATCH] --- yaml --- r: 317327 b: refs/heads/master c: e888fabd10cdd46a4b46bcc029c5c6d2364dab7f h: refs/heads/master i: 317325: 8d9aed9251578fe108c35f88d34a86ebb06f6ae9 317323: 101430d595a61c47310aa3192beda7ed11281e7e 317319: a379df3cdb2cf3e189665eae944dc43aa7838753 317311: 88f0398b95f4fcba28b23b3ee5b98718954ac1b7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/speakup/selection.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf8dce5f8846..a7517bef4cf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2c49a9ac993fa2b4795890d5fa56f2fc002453e +refs/heads/master: e888fabd10cdd46a4b46bcc029c5c6d2364dab7f diff --git a/trunk/drivers/staging/speakup/selection.c b/trunk/drivers/staging/speakup/selection.c index fe1f405d5d70..0612df06a4bf 100644 --- a/trunk/drivers/staging/speakup/selection.c +++ b/trunk/drivers/staging/speakup/selection.c @@ -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);