Commit fa13dd7c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge gregkh@kernel.bkbits.net:/home/gregkh/linux/i2c-2.5

into kroah.com:/home/greg/linux/BK/i2c-2.5
parents 232adff4 952461e0
......@@ -801,20 +801,13 @@ P: Oliver Neukum
M: drivers@neukum.org
S: Maintained
I2C DRIVERS
P: Simon Vogl
M: simon@tk.uni-linz.ac.at
P: Frodo Looijaard
M: frodol@dds.nl
L: linux-i2c@pelican.tk.uni-linz.ac.at
W: http://www.tk.uni-linz.ac.at/~simon/private/i2c
S: Maintained
SENSORS DRIVERS
I2C AND SENSORS DRIVERS
P: Frodo Looijaard
M: frodol@dds.nl
P: Philip Edelbrock
M: phil@netroedge.com
P: Greg Kroah-Hartman
M: greg@kroah.com
L: sensors@stimpy.netroedge.com
W: http://www.lm-sensors.nu/
S: Maintained
......
......@@ -585,6 +585,8 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
err = -ENOMEM;
goto ERROR1;
}
memset(new_client, 0x00, sizeof(struct i2c_client) +
sizeof(struct it87_data));
data = (struct it87_data *) (new_client + 1);
if (is_isa)
......
......@@ -212,7 +212,7 @@ handle_interrupt(struct keywest_iface *iface, u8 isr)
#ifndef POLLED_MODE
/* Interrupt handler */
static void
static irqreturn_t
keywest_irq(int irq, void *dev_id, struct pt_regs *regs)
{
struct keywest_iface *iface = (struct keywest_iface *)dev_id;
......@@ -225,6 +225,7 @@ keywest_irq(int irq, void *dev_id, struct pt_regs *regs)
add_timer(&iface->timeout_timer);
}
spin_unlock(&iface->lock);
return IRQ_HANDLED;
}
static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment