Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325602
b: refs/heads/master
c: 79d7532
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Jul 12, 2012
1 parent 51abe07 commit 63b2ffb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 157a4b311c45c9aba75a990464d9680867dc8805
refs/heads/master: 79d753209245de3d6f02480535a8f5cf21ad02f7
4 changes: 1 addition & 3 deletions trunk/drivers/tty/pty.c
Original file line number Diff line number Diff line change
Expand Up @@ -618,13 +618,12 @@ static int ptmx_open(struct inode *inode, struct file *filp)
/* find a device that is not in use. */
mutex_lock(&devpts_mutex);
index = devpts_new_index(inode);
mutex_unlock(&devpts_mutex);
if (index < 0) {
retval = index;
goto err_file;
}

mutex_unlock(&devpts_mutex);

mutex_lock(&tty_mutex);
tty = tty_init_dev(ptm_driver, index);

Expand Down Expand Up @@ -659,7 +658,6 @@ static int ptmx_open(struct inode *inode, struct file *filp)
mutex_unlock(&tty_mutex);
devpts_kill_index(inode, index);
err_file:
mutex_unlock(&devpts_mutex);
tty_free_file(filp);
return retval;
}
Expand Down

0 comments on commit 63b2ffb

Please sign in to comment.