diff options
Diffstat (limited to 'drivers/i2c/chips/pcf8574.c')
-rw-r--r-- | drivers/i2c/chips/pcf8574.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c index 6525743ff9fd..c323c2de236c 100644 --- a/drivers/i2c/chips/pcf8574.c +++ b/drivers/i2c/chips/pcf8574.c | |||
@@ -115,7 +115,7 @@ static int pcf8574_attach_adapter(struct i2c_adapter *adapter) | |||
115 | } | 115 | } |
116 | 116 | ||
117 | /* This function is called by i2c_probe */ | 117 | /* This function is called by i2c_probe */ |
118 | int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind) | 118 | static int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind) |
119 | { | 119 | { |
120 | struct i2c_client *new_client; | 120 | struct i2c_client *new_client; |
121 | struct pcf8574_data *data; | 121 | struct pcf8574_data *data; |
@@ -127,11 +127,10 @@ int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind) | |||
127 | 127 | ||
128 | /* OK. For now, we presume we have a valid client. We now create the | 128 | /* OK. For now, we presume we have a valid client. We now create the |
129 | client structure, even though we cannot fill it completely yet. */ | 129 | client structure, even though we cannot fill it completely yet. */ |
130 | if (!(data = kmalloc(sizeof(struct pcf8574_data), GFP_KERNEL))) { | 130 | if (!(data = kzalloc(sizeof(struct pcf8574_data), GFP_KERNEL))) { |
131 | err = -ENOMEM; | 131 | err = -ENOMEM; |
132 | goto exit; | 132 | goto exit; |
133 | } | 133 | } |
134 | memset(data, 0, sizeof(struct pcf8574_data)); | ||
135 | 134 | ||
136 | new_client = &data->client; | 135 | new_client = &data->client; |
137 | i2c_set_clientdata(new_client, data); | 136 | i2c_set_clientdata(new_client, data); |