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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
mfd
/
ucb1x00-core.c
diff --git
a/drivers/mfd/ucb1x00-core.c
b/drivers/mfd/ucb1x00-core.c
index
aff83f9
..
149810a
100644
(file)
--- a/
drivers/mfd/ucb1x00-core.c
+++ b/
drivers/mfd/ucb1x00-core.c
@@
-16,7
+16,6
@@
* 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>
@@
-204,7
+203,7
@@
void ucb1x00_adc_disable(struct ucb1x00 *ucb)
* SIBCLK to talk to the chip. We leave the clock running until
* we have finished processing all interrupts from the chip.
*/
* SIBCLK to talk to the chip. We leave the clock running until
* we have finished processing all interrupts from the chip.
*/
-static irqreturn_t ucb1x00_irq(int irqnr, void *devid
, struct pt_regs *regs
)
+static irqreturn_t ucb1x00_irq(int irqnr, void *devid)
{
struct ucb1x00 *ucb = devid;
struct ucb1x00_irq *irq;
{
struct ucb1x00 *ucb = devid;
struct ucb1x00_irq *irq;
@@
-420,8
+419,10
@@
static int ucb1x00_detect_irq(struct ucb1x00 *ucb)
unsigned long mask;
mask = probe_irq_on();
unsigned long mask;
mask = probe_irq_on();
- if (!mask)
+ if (!mask) {
+ probe_irq_off(mask);
return NO_IRQ;
return NO_IRQ;
+ }
/*
* Enable the ADC interrupt.
/*
* Enable the ADC interrupt.
@@
-478,7
+479,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) {
+ if (id != UCB_ID_1200 && id != UCB_ID_1300
&& id != UCB_ID_TC35143
) {
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;
}
@@
-507,7
+508,7
@@
static int ucb1x00_probe(struct mcp *mcp)
goto err_free;
}
goto err_free;
}
- ret = request_irq(ucb->irq, ucb1x00_irq,
SA
_TRIGGER_RISING,
+ ret = request_irq(ucb->irq, ucb1x00_irq,
IRQF
_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",