redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: dgnc: check the type of print before calling 

The dgnc_maxcps_room() function must be called only for print device.
The if-statement for checking print device checks before calling
dgnc_maxcps_room() and also this function doesn't need to have any
data except channel_t.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Daeseok Youn 2016-08-22 10:43:59 +09:00 committed by Greg Kroah-Hartman
parent 5d2b7c4a9d
commit 107b40ad04
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/dgnc/dgnc_tty.c
View File

@ -1492,18 +1492,8 @@ static int dgnc_tty_chars_in_buffer(struct tty_struct *tty)
* returns the new bytes_available. This only affects printer
* output.
*/
static int dgnc_maxcps_room(struct tty_struct *tty, int bytes_available)
static int dgnc_maxcps_room(struct channel_t *ch, int bytes_available)
{
struct un_t *un = tty->driver_data;
struct channel_t *ch = un->un_ch;
/*
* If its not the Transparent print device, return
* the full data amount.
*/
if (un->un_type != DGNC_PRINT)
return bytes_available;
if (ch->ch_digi.digi_maxcps > 0 && ch->ch_digi.digi_bufsize > 0) {
int cps_limit = 0;
unsigned long current_time = jiffies;
@ -1567,7 +1557,8 @@ static int dgnc_tty_write_room(struct tty_struct *tty)
ret += WQUEUESIZE;
/* Limit printer to maxcps */
ret = dgnc_maxcps_room(tty, ret);
if (un->un_type != DGNC_PRINT)
ret = dgnc_maxcps_room(ch, ret);
/*
* If we are printer device, leave space for
@ -1659,7 +1650,8 @@ static int dgnc_tty_write(struct tty_struct *tty,
* Limit printer output to maxcps overall, with bursts allowed
* up to bufsize characters.
*/
bufcount = dgnc_maxcps_room(tty, bufcount);
if (un->un_type != DGNC_PRINT)
bufcount = dgnc_maxcps_room(ch, bufcount);
/*
* Take minimum of what the user wants to send, and the