lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tty: tty_io.c shadows sparse fix

Browse Source 
drivers/char/tty_io.c:1413:17: warning: symbol 'buf' shadows an earlier one
drivers/char/tty_io.c:1379:20: originally declared here

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jason Wessel
2008-10-13 10:45:36 +01:00
committed by Linus Torvalds
parent 8440838bc5
commit 402fda9201
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/char/tty_io.c
View File

@@ -1026,19 +1026,19 @@ static inline ssize_t do_tty_write(
/* write_buf/write_cnt is protected by the atomic_write_lock mutex */ /* write_buf/write_cnt is protected by the atomic_write_lock mutex */
if (tty->write_cnt < chunk) { if (tty->write_cnt < chunk) {
unsigned char *buf; unsigned char *buf_chunk;
if (chunk < 1024) if (chunk < 1024)
chunk = 1024; chunk = 1024;
buf = kmalloc(chunk, GFP_KERNEL); buf_chunk = kmalloc(chunk, GFP_KERNEL);
if (!buf) { if (!buf_chunk) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
kfree(tty->write_buf); kfree(tty->write_buf);
tty->write_cnt = chunk; tty->write_cnt = chunk;
tty->write_buf = buf; tty->write_buf = buf_chunk;
} }
/* Do the write .. */ /* Do the write .. */