Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (38 commits)
V4L/DVB (12441): siano: read buffer overflow
V4L/DVB (12440): Use kzalloc for frontend states to have struct dvb_frontend properly
V4L/DVB (12438): Read buffer overflow
V4L/DVB (12437): dvb: siano uses/depends on INPUT
V4L/DVB (12436): stk-webcam: read buffer overflow
V4L/DVB (12432): em28xx: fix regression in Empire DualTV digital tuning
V4L/DVB (12429): v4l2-ioctl: fix G_STD and G_PARM default handlers
V4L/DVB (12428): hdpvr: add missing initialization of current_norm
V4L/DVB (12424): soc-camera: fix recursive locking in .buf_queue()
V4L/DVB (12422): media/zr364xx: fix build errors
V4L/DVB (12405): em28xx-cards: move register 0x13 setting to the proper place
V4L/DVB (12411): em28xx: Fix artifacts with Silvercrest webcam
V4L/DVB (12410): em28xx: Move the non-board dependent part to be outside em28xx_pre_card_setup()
V4L/DVB (12407): em28xx: Adjust Silvercrest xtal frequency
V4L/DVB (12406): em28xx: fix: don't do image interlacing on webcams
V4L/DVB (12403): em28xx: properly reports some em2710 chips
V4L/DVB (12402): em28xx: fix: some em2710 chips use a different vendor ID
V4L/DVB (12401): m9v011: add vflip/hflip controls to control mirror/upside down
V4L/DVB (12400): em28xx: Allow changing fps on webcams
V4L/DVB (12399): mt9v011: Add support for controlling frame rates
...
diff --git a/Makefile b/Makefile
index 0d46615..abcfa85 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 31
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
NAME = Man-Eating Seals of Antiquity
# *DOCUMENTATION*
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 61c679d..d222515 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -761,7 +761,6 @@
{
struct irq_desc *desc = irq_to_desc(irq);
struct irqaction *action, **action_ptr;
- struct task_struct *irqthread;
unsigned long flags;
WARN(in_interrupt(), "Trying to free IRQ %d from IRQ context!\n", irq);
@@ -809,9 +808,6 @@
desc->chip->disable(irq);
}
- irqthread = action->thread;
- action->thread = NULL;
-
spin_unlock_irqrestore(&desc->lock, flags);
unregister_handler_proc(irq, action);
@@ -819,12 +815,6 @@
/* Make sure it's not being used on another CPU: */
synchronize_irq(irq);
- if (irqthread) {
- if (!test_bit(IRQTF_DIED, &action->thread_flags))
- kthread_stop(irqthread);
- put_task_struct(irqthread);
- }
-
#ifdef CONFIG_DEBUG_SHIRQ
/*
* It's a shared IRQ -- the driver ought to be prepared for an IRQ
@@ -840,6 +830,13 @@
local_irq_restore(flags);
}
#endif
+
+ if (action->thread) {
+ if (!test_bit(IRQTF_DIED, &action->thread_flags))
+ kthread_stop(action->thread);
+ put_task_struct(action->thread);
+ }
+
return action;
}