diff options
Diffstat (limited to 'drivers/tty/n_r3964.c')
| -rw-r--r-- | drivers/tty/n_r3964.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c index 5c6c31459a2..1e6405070ce 100644 --- a/drivers/tty/n_r3964.c +++ b/drivers/tty/n_r3964.c @@ -1065,7 +1065,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,  	TRACE_L("read()"); -	tty_lock(); +	tty_lock(tty);  	pClient = findClient(pInfo, task_pid(current));  	if (pClient) { @@ -1077,7 +1077,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,  				goto unlock;  			}  			/* block until there is a message: */ -			wait_event_interruptible_tty(pInfo->read_wait, +			wait_event_interruptible_tty(tty, pInfo->read_wait,  					(pMsg = remove_msg(pInfo, pClient)));  		} @@ -1107,7 +1107,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,  	}  	ret = -EPERM;  unlock: -	tty_unlock(); +	tty_unlock(tty);  	return ret;  } @@ -1156,7 +1156,7 @@ static ssize_t r3964_write(struct tty_struct *tty, struct file *file,  	pHeader->locks = 0;  	pHeader->owner = NULL; -	tty_lock(); +	tty_lock(tty);  	pClient = findClient(pInfo, task_pid(current));  	if (pClient) { @@ -1175,7 +1175,7 @@ static ssize_t r3964_write(struct tty_struct *tty, struct file *file,  	add_tx_queue(pInfo, pHeader);  	trigger_transmit(pInfo); -	tty_unlock(); +	tty_unlock(tty);  	return 0;  }  |