patch-1.3.74 linux/drivers/char/ftape/fdc-io.c
Next file: linux/drivers/char/ftape/fdc-isr.c
Previous file: linux/drivers/char/ftape/fc-10.c
Back to the patch index
Back to the overall index
- Lines: 43
- Date:
Thu Mar 14 11:55:09 1996
- Orig file:
v1.3.73/linux/drivers/char/ftape/fdc-io.c
- Orig date:
Sun Mar 10 09:49:48 1996
diff -u --recursive --new-file v1.3.73/linux/drivers/char/ftape/fdc-io.c linux/drivers/char/ftape/fdc-io.c
@@ -21,7 +21,6 @@
* for the QIC-40/80 tape streamer device driver.
*/
-#include <linux/module.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/ioport.h>
@@ -69,6 +68,8 @@
static byte fdc_drv_spec[4]; /* drive specification bytes for i82078 */
static int perpend_mode; /* true if fdc is in perpendicular mode */
+static char ftape_id[] = "ftape"; /* used by request irq and free irq */
+
void fdc_catch_stray_interrupts(unsigned count)
{
unsigned long flags;
@@ -1179,7 +1180,6 @@
{
TRACE_FUN(8, "fdc_grab_irq_and_dma");
int result = 0;
- static char ftape_id[] = "ftape";
if (fdc.hook == &do_ftape) {
/* Get fast interrupt handler.
@@ -1193,7 +1193,7 @@
result = request_dma(fdc.dma, ftape_id);
if (result) {
TRACEx1(-1, "Unable to grab DMA%d for ftape driver", fdc.dma);
- free_irq(fdc.irq, NULL);
+ free_irq(fdc.irq, ftape_id);
result = -EIO;
} else {
enable_irq(fdc.irq);
@@ -1224,7 +1224,7 @@
disable_dma(fdc.dma); /* just in case... */
free_dma(fdc.dma);
disable_irq(fdc.irq);
- free_irq(fdc.irq, NULL);
+ free_irq(fdc.irq, ftape_id);
}
#ifdef FDC_DMA
if (result == 0 && FDC_DMA == 2) {
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this