summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorAlex Dubov <oakad@yahoo.com>2008-03-10 19:43:41 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-11 02:01:18 +0100
commite4c70e8521c893fa96b14ed5d90d52fa37ac1dec (patch)
tree4256e605342ea81c55e8cd630743df8f0d49426e /drivers/misc
parenttifm: fix memorystick host initialization code (diff)
downloadlinux-e4c70e8521c893fa96b14ed5d90d52fa37ac1dec.tar.xz
linux-e4c70e8521c893fa96b14ed5d90d52fa37ac1dec.zip
tifm: clear interrupt mask bits before setting them on adapter init
This should improve reliability of detection of cards already in socket on driver load. Signed-off-by: Alex Dubov <oakad@yahoo.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/tifm_7xx1.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index 63a089b29545..67503ea71d21 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -368,6 +368,8 @@ static int tifm_7xx1_probe(struct pci_dev *dev,
goto err_out_irq;
writel(TIFM_IRQ_ENABLE | TIFM_IRQ_SOCKMASK((1 << fm->num_sockets) - 1),
+ fm->addr + FM_CLEAR_INTERRUPT_ENABLE);
+ writel(TIFM_IRQ_ENABLE | TIFM_IRQ_SOCKMASK((1 << fm->num_sockets) - 1),
fm->addr + FM_SET_INTERRUPT_ENABLE);
return 0;