diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2011-08-03 16:21:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:31:31 -0700 |
| commit | a2708fa28f668db0b9103fc051b9c464695840a8 (patch) | |
| tree | bba9f3b9819e2bbec05216616e15e7df0a10c4c9 /arch/cris | |
| parent | f5508a09533496f60e96b09c6cf318999051cf79 (diff) | |
| download | kernel_samsung_smdk4412-a2708fa28f668db0b9103fc051b9c464695840a8.zip kernel_samsung_smdk4412-a2708fa28f668db0b9103fc051b9c464695840a8.tar.gz kernel_samsung_smdk4412-a2708fa28f668db0b9103fc051b9c464695840a8.tar.bz2 | |
cris: fix a build error in sync_serial_open()
commit 4b851d88192c22cf77418a0b4c45b5c789276837 upstream.
Fix:
arch/cris/arch-v10/drivers/sync_serial.c:628: error: 'ret' undeclared (first use in this function)
'ret' should be 'err'.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v10/drivers/sync_serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c index 85026537..d2ad9e7 100644 --- a/arch/cris/arch-v10/drivers/sync_serial.c +++ b/arch/cris/arch-v10/drivers/sync_serial.c @@ -625,11 +625,11 @@ static int sync_serial_open(struct inode *inode, struct file *file) *R_IRQ_MASK1_SET = 1 << port->data_avail_bit; DEBUG(printk(KERN_DEBUG "sser%d rec started\n", dev)); } - ret = 0; + err = 0; out: mutex_unlock(&sync_serial_mutex); - return ret; + return err; } static int sync_serial_release(struct inode *inode, struct file *file) |