From d26fe58d7c4c5d79c3d171ecb90f13587a2b729f Mon Sep 17 00:00:00 2001 From: WANG Cong Date: Wed, 3 Aug 2011 16:21:14 -0700 Subject: [PATCH] --- yaml --- r: 262311 b: refs/heads/master c: 4b851d88192c22cf77418a0b4c45b5c789276837 h: refs/heads/master i: 262309: ead1d61243bd44e4edc7f36db552d0a2990f66c5 262307: dd6f3ada613afac781298bf7f4fe66e747f03312 262303: 65f75a733246bfbedad5d194208d3a4dff5e602f v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/drivers/sync_serial.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 79a8b8207805..cf5544a929d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4969213f9e75ec1bfa6ea65c279c64cab7d1bd6 +refs/heads/master: 4b851d88192c22cf77418a0b4c45b5c789276837 diff --git a/trunk/arch/cris/arch-v10/drivers/sync_serial.c b/trunk/arch/cris/arch-v10/drivers/sync_serial.c index 850265373611..d2ad9e7a1738 100644 --- a/trunk/arch/cris/arch-v10/drivers/sync_serial.c +++ b/trunk/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)