Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
sound
/
soc
/
sunxi
/
sun4i-codec.c
diff --git
a/kernel/sound/soc/sunxi/sun4i-codec.c
b/kernel/sound/soc/sunxi/sun4i-codec.c
index
1bb896d
..
1a4999f
100644
(file)
--- a/
kernel/sound/soc/sunxi/sun4i-codec.c
+++ b/
kernel/sound/soc/sunxi/sun4i-codec.c
@@
-575,11
+575,11
@@
static struct snd_soc_card *sun4i_codec_create_card(struct device *dev)
card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
if (!card)
card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
if (!card)
- return
NULL
;
+ return
ERR_PTR(-ENOMEM)
;
card->dai_link = sun4i_codec_create_link(dev, &card->num_links);
if (!card->dai_link)
card->dai_link = sun4i_codec_create_link(dev, &card->num_links);
if (!card->dai_link)
- return
NULL
;
+ return
ERR_PTR(-ENOMEM)
;
card->dev = dev;
card->name = "sun4i-codec";
card->dev = dev;
card->name = "sun4i-codec";
@@
-661,7
+661,8
@@
static int sun4i_codec_probe(struct platform_device *pdev)
}
card = sun4i_codec_create_card(&pdev->dev);
}
card = sun4i_codec_create_card(&pdev->dev);
- if (!card) {
+ if (IS_ERR(card)) {
+ ret = PTR_ERR(card);
dev_err(&pdev->dev, "Failed to create our card\n");
goto err_unregister_codec;
}
dev_err(&pdev->dev, "Failed to create our card\n");
goto err_unregister_codec;
}