diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-03-16 09:15:13 -0500 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-03-16 09:15:13 -0500 |
commit | cb1b77804091cc3491da4338a3599e318f358b25 (patch) | |
tree | 481372e91d926b566d7e59c08a97bd3c16c5026a /drivers/hwmon/f75375s.c | |
parent | da5309cd28ffda6ed8a4147bd14f1e4fbbd6503d (diff) | |
parent | 5bee17f18b595937e6beafeee5197868a3f74a06 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/hwmon/f75375s.c')
-rw-r--r-- | drivers/hwmon/f75375s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c index 1692de36996..18a1ba88816 100644 --- a/drivers/hwmon/f75375s.c +++ b/drivers/hwmon/f75375s.c @@ -617,7 +617,7 @@ static void f75375_init(struct i2c_client *client, struct f75375_data *data, static int f75375_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct f75375_data *data = i2c_get_clientdata(client); + struct f75375_data *data; struct f75375s_platform_data *f75375s_pdata = client->dev.platform_data; int err; |