projects
/
deliverable
/
linux.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/simple', 'asoc/topic/sta32x', 'asoc/topic...
[deliverable/linux.git]
/
sound
/
soc
/
generic
/
simple-card.c
diff --git
a/sound/soc/generic/simple-card.c
b/sound/soc/generic/simple-card.c
index cb3998d96cca3803431d7c9a0ac970f59b51a2a2..f7c6734bd5daee1dafd76ba8b6feafa05b2a6c52 100644
(file)
--- a/
sound/soc/generic/simple-card.c
+++ b/
sound/soc/generic/simple-card.c
@@
-486,9
+486,8
@@
static int asoc_simple_card_parse_of(struct device_node *node,
}
/* Decrease the reference count of the device nodes */
}
/* Decrease the reference count of the device nodes */
-static int asoc_simple_card_unref(struct
platform_device *pdev
)
+static int asoc_simple_card_unref(struct
snd_soc_card *card
)
{
{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
struct snd_soc_dai_link *dai_link;
int num_links;
struct snd_soc_dai_link *dai_link;
int num_links;
@@
-590,7
+589,7
@@
static int asoc_simple_card_probe(struct platform_device *pdev)
return ret;
err:
return ret;
err:
- asoc_simple_card_unref(
pdev
);
+ asoc_simple_card_unref(
&priv->snd_card
);
return ret;
}
return ret;
}
@@
-606,7
+605,7
@@
static int asoc_simple_card_remove(struct platform_device *pdev)
snd_soc_jack_free_gpios(&simple_card_mic_jack, 1,
&simple_card_mic_jack_gpio);
snd_soc_jack_free_gpios(&simple_card_mic_jack, 1,
&simple_card_mic_jack_gpio);
- return asoc_simple_card_unref(
pdev
);
+ return asoc_simple_card_unref(
card
);
}
static const struct of_device_id asoc_simple_of_match[] = {
}
static const struct of_device_id asoc_simple_of_match[] = {
This page took
0.025107 seconds
and
5
git commands to generate.