aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorUrsula Braun-Krahl <braunu@de.ibm.com>2005-01-14 23:32:44 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-14 23:32:44 -0800
commitf172f42182829b6d6de12417295ca9e1c3ddce3c (patch)
tree547e75d8f38a789b730dec9127685ae671312551 /drivers
parentf0736a22ce9d2e725a9a1747ddaa699a7f6fb63b (diff)
downloadhistory-f172f42182829b6d6de12417295ca9e1c3ddce3c.tar.gz
[PATCH] s390: remove irq_exit from iucv
Remove the irq_exit call on error path in iucv_irq_handler. irq_exit is done in do_extint(). Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/net/iucv.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c
index 3a55d5e981b053..d0992c0ad28dee 100644
--- a/drivers/s390/net/iucv.c
+++ b/drivers/s390/net/iucv.c
@@ -1,5 +1,5 @@
/*
- * $Id: iucv.c,v 1.41 2004/08/11 14:54:14 geraldsc Exp $
+ * $Id: iucv.c,v 1.42 2005/01/07 10:49:54 braunu Exp $
*
* IUCV network driver
*
@@ -29,7 +29,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * RELEASE-TAG: IUCV lowlevel driver $Revision: 1.41 $
+ * RELEASE-TAG: IUCV lowlevel driver $Revision: 1.42 $
*
*/
@@ -355,7 +355,7 @@ do { \
static void
iucv_banner(void)
{
- char vbuf[] = "$Revision: 1.41 $";
+ char vbuf[] = "$Revision: 1.42 $";
char *version = vbuf;
if ((version = strchr(version, ':'))) {
@@ -2285,7 +2285,6 @@ iucv_irq_handler(struct pt_regs *regs, __u16 code)
irqdata = kmalloc(sizeof(iucv_irqdata), GFP_ATOMIC);
if (!irqdata) {
printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
- irq_exit();
return;
}