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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
misc
/
ibmasm
/
module.c
diff --git
a/drivers/misc/ibmasm/module.c
b/drivers/misc/ibmasm/module.c
index
2f3bddf
..
1fdf03f
100644
(file)
--- a/
drivers/misc/ibmasm/module.c
+++ b/
drivers/misc/ibmasm/module.c
@@
-85,7
+85,7
@@
static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
}
memset(sp, 0, sizeof(struct service_processor));
}
memset(sp, 0, sizeof(struct service_processor));
- sp
in_lock_init(&sp->lock)
;
+ sp
->lock = SPIN_LOCK_UNLOCKED
;
INIT_LIST_HEAD(&sp->command_queue);
pci_set_drvdata(pdev, (void *)sp);
INIT_LIST_HEAD(&sp->command_queue);
pci_set_drvdata(pdev, (void *)sp);
@@
-113,7
+113,7
@@
static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
goto error_ioremap;
}
goto error_ioremap;
}
- result = request_irq(sp->irq, ibmasm_interrupt_handler,
IRQF_SHARED
, sp->devname, (void*)sp);
+ result = request_irq(sp->irq, ibmasm_interrupt_handler,
SA_SHIRQ
, sp->devname, (void*)sp);
if (result) {
dev_err(sp->dev, "Failed to register interrupt handler\n");
goto error_request_irq;
if (result) {
dev_err(sp->dev, "Failed to register interrupt handler\n");
goto error_request_irq;