aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/codecs/cs35l32.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c
index 7e9806206648..e41d8ebe6eea 100644
--- a/sound/soc/codecs/cs35l32.c
+++ b/sound/soc/codecs/cs35l32.c
@@ -358,10 +358,8 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client,
358 358
359 cs35l32 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs35l32_private), 359 cs35l32 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs35l32_private),
360 GFP_KERNEL); 360 GFP_KERNEL);
361 if (!cs35l32) { 361 if (!cs35l32)
362 dev_err(&i2c_client->dev, "could not allocate codec\n");
363 return -ENOMEM; 362 return -ENOMEM;
364 }
365 363
366 i2c_set_clientdata(i2c_client, cs35l32); 364 i2c_set_clientdata(i2c_client, cs35l32);
367 365
@@ -378,10 +376,9 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client,
378 pdata = devm_kzalloc(&i2c_client->dev, 376 pdata = devm_kzalloc(&i2c_client->dev,
379 sizeof(struct cs35l32_platform_data), 377 sizeof(struct cs35l32_platform_data),
380 GFP_KERNEL); 378 GFP_KERNEL);
381 if (!pdata) { 379 if (!pdata)
382 dev_err(&i2c_client->dev, "could not allocate pdata\n");
383 return -ENOMEM; 380 return -ENOMEM;
384 } 381
385 if (i2c_client->dev.of_node) { 382 if (i2c_client->dev.of_node) {
386 ret = cs35l32_handle_of_data(i2c_client, 383 ret = cs35l32_handle_of_data(i2c_client,
387 &cs35l32->pdata); 384 &cs35l32->pdata);