From a9e44d831dcd672f8f6572cbefdb88e8f794be23 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 3 Feb 2004 18:30:32 -0800 Subject: [PATCH] [PATCH] Eicon isdn driver flush_scheduled_work() fix From: Armin flush_scheduled_work() may not be called from irq-context and it is not necessary for the diva_os_cancel_soft_isr() function anyway. --- drivers/isdn/hardware/eicon/divasmain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index cb40533fa5875..08ad9bf08cb36 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c @@ -1,4 +1,4 @@ -/* $Id: divasmain.c,v 1.46 2003/10/10 12:28:14 armin Exp $ +/* $Id: divasmain.c,v 1.47 2004/02/03 16:03:01 armin Exp $ * * Low level driver for Eicon DIVA Server ISDN cards. * @@ -41,7 +41,7 @@ #include "diva_dma.h" #include "diva_pci.h" -static char *main_revision = "$Revision: 1.46 $"; +static char *main_revision = "$Revision: 1.47 $"; static int major; @@ -594,7 +594,6 @@ int diva_os_schedule_soft_isr(diva_os_soft_isr_t * psoft_isr) int diva_os_cancel_soft_isr(diva_os_soft_isr_t * psoft_isr) { - flush_scheduled_work(); return (0); } -- 2.53.0