diff options
Diffstat (limited to 'drivers/hwmon/lm78.c')
-rw-r--r-- | drivers/hwmon/lm78.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index f6730dc3573b..bde0cda9477e 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c | |||
@@ -480,7 +480,7 @@ static int lm78_isa_attach_adapter(struct i2c_adapter *adapter) | |||
480 | } | 480 | } |
481 | 481 | ||
482 | /* This function is called by i2c_probe */ | 482 | /* This function is called by i2c_probe */ |
483 | int lm78_detect(struct i2c_adapter *adapter, int address, int kind) | 483 | static int lm78_detect(struct i2c_adapter *adapter, int address, int kind) |
484 | { | 484 | { |
485 | int i, err; | 485 | int i, err; |
486 | struct i2c_client *new_client; | 486 | struct i2c_client *new_client; |
@@ -540,11 +540,10 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind) | |||
540 | client structure, even though we cannot fill it completely yet. | 540 | client structure, even though we cannot fill it completely yet. |
541 | But it allows us to access lm78_{read,write}_value. */ | 541 | But it allows us to access lm78_{read,write}_value. */ |
542 | 542 | ||
543 | if (!(data = kmalloc(sizeof(struct lm78_data), GFP_KERNEL))) { | 543 | if (!(data = kzalloc(sizeof(struct lm78_data), GFP_KERNEL))) { |
544 | err = -ENOMEM; | 544 | err = -ENOMEM; |
545 | goto ERROR1; | 545 | goto ERROR1; |
546 | } | 546 | } |
547 | memset(data, 0, sizeof(struct lm78_data)); | ||
548 | 547 | ||
549 | new_client = &data->client; | 548 | new_client = &data->client; |
550 | if (is_isa) | 549 | if (is_isa) |
@@ -726,7 +725,6 @@ static int lm78_write_value(struct i2c_client *client, u8 reg, u8 value) | |||
726 | return i2c_smbus_write_byte_data(client, reg, value); | 725 | return i2c_smbus_write_byte_data(client, reg, value); |
727 | } | 726 | } |
728 | 727 | ||
729 | /* Called when we have found a new LM78. It should set limits, etc. */ | ||
730 | static void lm78_init_client(struct i2c_client *client) | 728 | static void lm78_init_client(struct i2c_client *client) |
731 | { | 729 | { |
732 | u8 config = lm78_read_value(client, LM78_REG_CONFIG); | 730 | u8 config = lm78_read_value(client, LM78_REG_CONFIG); |