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)