git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23', 'asoc...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
tegra
/
tegra_max98090.c
diff --git
a/sound/soc/tegra/tegra_max98090.c
b/sound/soc/tegra/tegra_max98090.c
index a403db6d563e7cdaa2f0248212a40a3404b79d05..c34a54d6e8121b9a6ba6c2b996112908eac25778 100644
(file)
--- a/
sound/soc/tegra/tegra_max98090.c
+++ b/
sound/soc/tegra/tegra_max98090.c
@@
-225,10
+225,8
@@
static int tegra_max98090_probe(struct platform_device *pdev)
machine = devm_kzalloc(&pdev->dev,
sizeof(struct tegra_max98090), GFP_KERNEL);
- if (!machine) {
- dev_err(&pdev->dev, "Can't allocate tegra_max98090\n");
+ if (!machine)
return -ENOMEM;
- }
card->dev = &pdev->dev;
platform_set_drvdata(pdev, card);