git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'connlimit' of git://dev.medozas.de/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
ams-delta-fiq.c
diff --git
a/arch/arm/mach-omap1/ams-delta-fiq.c
b/arch/arm/mach-omap1/ams-delta-fiq.c
index
6c994e2
..
152b32c
100644
(file)
--- a/
arch/arm/mach-omap1/ams-delta-fiq.c
+++ b/
arch/arm/mach-omap1/ams-delta-fiq.c
@@
-49,7
+49,7
@@
static irqreturn_t deferred_fiq(int irq, void *dev_id)
irq_desc = irq_to_desc(IH_GPIO_BASE);
if (irq_desc)
irq_desc = irq_to_desc(IH_GPIO_BASE);
if (irq_desc)
- irq_chip = irq_desc->chip;
+ irq_chip = irq_desc->
irq_data.
chip;
/*
* For each handled GPIO interrupt, keep calling its interrupt handler
/*
* For each handled GPIO interrupt, keep calling its interrupt handler
@@
-62,13
+62,15
@@
static irqreturn_t deferred_fiq(int irq, void *dev_id)
while (irq_counter[gpio] < fiq_count) {
if (gpio != AMS_DELTA_GPIO_PIN_KEYBRD_CLK) {
while (irq_counter[gpio] < fiq_count) {
if (gpio != AMS_DELTA_GPIO_PIN_KEYBRD_CLK) {
+ struct irq_data *d = irq_get_irq_data(irq_num);
+
/*
* It looks like handle_edge_irq() that
* OMAP GPIO edge interrupts default to,
* expects interrupt already unmasked.
*/
/*
* It looks like handle_edge_irq() that
* OMAP GPIO edge interrupts default to,
* expects interrupt already unmasked.
*/
- if (irq_chip && irq_chip->unmask)
- irq_chip->
unmask(irq_num
);
+ if (irq_chip && irq_chip->
irq_
unmask)
+ irq_chip->
irq_unmask(d
);
}
generic_handle_irq(irq_num);
}
generic_handle_irq(irq_num);