2003-02-22 13:34:19

by Michael Mueller

[permalink] [raw]
Subject: [PATCH] [m68k] mach_default_handler not always tested against NULL

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.757.40.1 -> 1.757.40.2
# arch/m68k/kernel/ints.c 1.2 -> 1.3
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/02/22 [email protected] 1.757.40.2
# ints.c:
# Fix: Check mach_default_handler before using it.
# --------------------------------------------
#
diff -Nru a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
--- a/arch/m68k/kernel/ints.c Sat Feb 22 13:29:15 2003
+++ b/arch/m68k/kernel/ints.c Sat Feb 22 13:29:15 2003
@@ -175,7 +175,8 @@
printk("%s: Removing probably wrong IRQ %d from %s\n",
__FUNCTION__, irq, irq_list[irq].devname);

- irq_list[irq].handler = (*mach_default_handler)[irq];
+ if (mach_default_handler)
+ irq_list[irq].handler = (*mach_default_handler)[irq];
irq_list[irq].flags = 0;
irq_list[irq].dev_id = NULL;
irq_list[irq].devname = default_names[irq];