diff options
| author | Alan Cox <alan@redhat.com> | 2008-10-13 11:46:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 18:51:44 +0200 |
| commit | a18992d4652553f65469ac72b54b7fdd4f058277 (patch) | |
| tree | 76b9347d3e11f0ef125f3466560f565e88a52d38 /drivers/s390 | |
| parent | fs3270: remove extra locks (diff) | |
| download | linux-a18992d4652553f65469ac72b54b7fdd4f058277.tar.xz linux-a18992d4652553f65469ac72b54b7fdd4f058277.zip | |
fs3270: Correct error returns
Drop the kernel lock further and also correct cases where we set rc to an
error code, and then return 0
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/char/fs3270.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c index 1227f4591f8d..40759c33477d 100644 --- a/drivers/s390/char/fs3270.c +++ b/drivers/s390/char/fs3270.c @@ -418,23 +418,22 @@ fs3270_open(struct inode *inode, struct file *filp) { struct fs3270 *fp; struct idal_buffer *ib; - int minor, rc; + int minor, rc = 0; if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR) return -ENODEV; - lock_kernel(); minor = iminor(filp->f_path.dentry->d_inode); /* Check for minor 0 multiplexer. */ if (minor == 0) { struct tty_struct *tty = get_current_tty(); if (!tty || tty->driver->major != IBM_TTY3270_MAJOR) { tty_kref_put(tty); - rc = -ENODEV; - goto out; + return -ENODEV; } minor = tty->index + RAW3270_FIRSTMINOR; tty_kref_put(tty); } + lock_kernel(); /* Check if some other program is already using fullscreen mode. */ fp = (struct fs3270 *) raw3270_find_view(&fs3270_fn, minor); if (!IS_ERR(fp)) { @@ -476,7 +475,7 @@ fs3270_open(struct inode *inode, struct file *filp) filp->private_data = fp; out: unlock_kernel(); - return 0; + return rc; } /* |