summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2011-08-03 16:21:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-03 14:25:21 -1000
commit4b851d88192c22cf77418a0b4c45b5c789276837 (patch)
tree6bc0f1927642398a1df3bc1559d91a52d882435a /arch/cris
parentd4969213f9e75ec1bfa6ea65c279c64cab7d1bd6 (diff)
downloadlwn-4b851d88192c22cf77418a0b4c45b5c789276837.tar.gz
lwn-4b851d88192c22cf77418a0b4c45b5c789276837.zip
cris: fix a build error in sync_serial_open()
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> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v10/drivers/sync_serial.c4
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 850265373611..d2ad9e7a1738 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)