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
/
mfd
/
ucb1x00-core.c
diff --git
a/drivers/mfd/ucb1x00-core.c
b/drivers/mfd/ucb1x00-core.c
index
2bf3272
..
aff83f9
100644
(file)
--- a/
drivers/mfd/ucb1x00-core.c
+++ b/
drivers/mfd/ucb1x00-core.c
@@
-16,6
+16,7
@@
* Note that all locks are private to this file. Nothing else may
* touch them.
*/
* Note that all locks are private to this file. Nothing else may
* touch them.
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
@@
-419,10
+420,8
@@
static int ucb1x00_detect_irq(struct ucb1x00 *ucb)
unsigned long mask;
mask = probe_irq_on();
unsigned long mask;
mask = probe_irq_on();
- if (!mask) {
- probe_irq_off(mask);
+ if (!mask)
return NO_IRQ;
return NO_IRQ;
- }
/*
* Enable the ADC interrupt.
/*
* Enable the ADC interrupt.
@@
-479,7
+478,7
@@
static int ucb1x00_probe(struct mcp *mcp)
mcp_enable(mcp);
id = mcp_reg_read(mcp, UCB_ID);
mcp_enable(mcp);
id = mcp_reg_read(mcp, UCB_ID);
- if (id != UCB_ID_1200 && id != UCB_ID_1300
&& id != UCB_ID_TC35143
) {
+ if (id != UCB_ID_1200 && id != UCB_ID_1300) {
printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id);
goto err_disable;
}
printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id);
goto err_disable;
}
@@
-508,7
+507,7
@@
static int ucb1x00_probe(struct mcp *mcp)
goto err_free;
}
goto err_free;
}
- ret = request_irq(ucb->irq, ucb1x00_irq,
IRQF
_TRIGGER_RISING,
+ ret = request_irq(ucb->irq, ucb1x00_irq,
SA
_TRIGGER_RISING,
"UCB1x00", ucb);
if (ret) {
printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n",
"UCB1x00", ucb);
if (ret) {
printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n",