projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'
[linux-2.6-block.git]
/
sound
/
soc
/
codecs
/
tfa9879.c
diff --git
a/sound/soc/codecs/tfa9879.c
b/sound/soc/codecs/tfa9879.c
index 16f1b71edb554aac82cb74093cbf6a80b84f5d0b..aab0af681e8cb3cd1b2c0ea0b5a22e32c1f08c2b 100644
(file)
--- a/
sound/soc/codecs/tfa9879.c
+++ b/
sound/soc/codecs/tfa9879.c
@@
-280,8
+280,8
@@
static int tfa9879_i2c_probe(struct i2c_client *i2c,
int i;
tfa9879 = devm_kzalloc(&i2c->dev, sizeof(*tfa9879), GFP_KERNEL);
- if (
IS_ERR(tfa9879)
)
- return
PTR_ERR(tfa9879)
;
+ if (
!tfa9879
)
+ return
-ENOMEM
;
i2c_set_clientdata(i2c, tfa9879);