Commit 0c112ee5 authored by Mark D. Studebaker's avatar Mark D. Studebaker Committed by Greg Kroah-Hartman

[PATCH] I2C: i2c-isa functionality

The "functionality" return was incorrectly removed for i2c-isa.c when porting to 2.5.
A driver that does nothing must return a 0 or else i2c-core assumes
0xffffffff (all functionality).
parent d3136dc2
...@@ -30,10 +30,13 @@ ...@@ -30,10 +30,13 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/i2c.h> #include <linux/i2c.h>
static u32 isa_func(struct i2c_adapter *adapter);
/* This is the actual algorithm we define */ /* This is the actual algorithm we define */
static struct i2c_algorithm isa_algorithm = { static struct i2c_algorithm isa_algorithm = {
.name = "ISA bus algorithm", .name = "ISA bus algorithm",
.id = I2C_ALGO_ISA, .id = I2C_ALGO_ISA,
.functionality = isa_func,
}; };
/* There can only be one... */ /* There can only be one... */
...@@ -45,6 +48,12 @@ static struct i2c_adapter isa_adapter = { ...@@ -45,6 +48,12 @@ static struct i2c_adapter isa_adapter = {
.name = "ISA main adapter", .name = "ISA main adapter",
}; };
/* We can't do a thing... */
static u32 isa_func(struct i2c_adapter *adapter)
{
return 0;
}
static int __init i2c_isa_init(void) static int __init i2c_isa_init(void)
{ {
return i2c_add_adapter(&isa_adapter); return i2c_add_adapter(&isa_adapter);
......
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