git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
pcmcia
/
hd64465_ss.c
diff --git
a/drivers/pcmcia/hd64465_ss.c
b/drivers/pcmcia/hd64465_ss.c
index
b39435b
..
ad02629
100644
(file)
--- a/
drivers/pcmcia/hd64465_ss.c
+++ b/
drivers/pcmcia/hd64465_ss.c
@@
-244,8
+244,8
@@
static void hs_map_irq(hs_socket_t *sp, unsigned int irq)
hs_mapped_irq[irq].sock = sp;
/* insert ourselves as the irq controller */
hs_mapped_irq[irq].sock = sp;
/* insert ourselves as the irq controller */
- hs_mapped_irq[irq].old_handler = irq_desc[irq].
handler
;
- irq_desc[irq].
handler
= &hd64465_ss_irq_type;
+ hs_mapped_irq[irq].old_handler = irq_desc[irq].
chip
;
+ irq_desc[irq].
chip
= &hd64465_ss_irq_type;
}
}
@@
-260,7
+260,7
@@
static void hs_unmap_irq(hs_socket_t *sp, unsigned int irq)
return;
/* restore the original irq controller */
return;
/* restore the original irq controller */
- irq_desc[irq].
handler
= hs_mapped_irq[irq].old_handler;
+ irq_desc[irq].
chip
= hs_mapped_irq[irq].old_handler;
}
/*============================================================*/
}
/*============================================================*/
@@
-761,7
+761,7
@@
static int hs_init_socket(hs_socket_t *sp, int irq, unsigned long mem_base,
hd64465_register_irq_demux(sp->irq, hs_irq_demux, sp);
hd64465_register_irq_demux(sp->irq, hs_irq_demux, sp);
- if ((err = request_irq(sp->irq, hs_interrupt,
SA_INTERRUPT
, MODNAME, sp)) < 0)
+ if ((err = request_irq(sp->irq, hs_interrupt,
IRQF_DISABLED
, MODNAME, sp)) < 0)
return err;
if (request_mem_region(sp->mem_base, sp->mem_length, MODNAME) == 0) {
sp->mem_base = 0;
return err;
if (request_mem_region(sp->mem_base, sp->mem_length, MODNAME) == 0) {
sp->mem_base = 0;