All of lore.kernel.org
 help / color / mirror / Atom feed
* [merged] cris-fix-a-build-error-in-sync_serial_open.patch removed from -mm tree
@ 2011-08-16 18:50 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2011-08-16 18:50 UTC (permalink / raw)
  To: xiyou.wangcong, geert, jesper.nilsson, stable, starvik, mm-commits


The patch titled
     cris: fix a build error in sync_serial_open()
has been removed from the -mm tree.  Its filename was
     cris-fix-a-build-error-in-sync_serial_open.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: cris: fix a build error in sync_serial_open()
From: WANG Cong <xiyou.wangcong@gmail.com>

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>
---

 arch/cris/arch-v10/drivers/sync_serial.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/cris/arch-v10/drivers/sync_serial.c~cris-fix-a-build-error-in-sync_serial_open arch/cris/arch-v10/drivers/sync_serial.c
--- a/arch/cris/arch-v10/drivers/sync_serial.c~cris-fix-a-build-error-in-sync_serial_open
+++ a/arch/cris/arch-v10/drivers/sync_serial.c
@@ -625,11 +625,11 @@ static int sync_serial_open(struct inode
 			*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)
_

Patches currently in -mm which might be from xiyou.wangcong@gmail.com are

origin.patch
kexec-remove-kmsg_dump_kexec.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-08-16 18:48 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-16 18:50 [merged] cris-fix-a-build-error-in-sync_serial_open.patch removed from -mm tree akpm

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.