diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-09 09:56:43 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-09 09:56:43 (GMT) |
| commit | e8fd86efaa09445ca1afc1aea08d4666c966ed03 (patch) | |
| tree | e6b42da2811b9ca49529195a3a66f7f2ddebe2f3 /sound/soc/soc-core.c | |
| parent | abaead6ac55dbda8b4bae40251d69dc3f0c49b1c (diff) | |
| parent | 18361bbe3180eca62796188d62aefac1519f4c83 (diff) | |
| download | linux-e8fd86efaa09445ca1afc1aea08d4666c966ed03.tar.xz | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d75043e..b194be0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1929,8 +1929,9 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) "%s", card->name); snprintf(card->snd_card->longname, sizeof(card->snd_card->longname), "%s", card->long_name ? card->long_name : card->name); - snprintf(card->snd_card->driver, sizeof(card->snd_card->driver), - "%s", card->driver_name ? card->driver_name : card->name); + if (card->driver_name) + strlcpy(card->snd_card->driver, card->driver_name, + sizeof(card->snd_card->driver)); if (card->late_probe) { ret = card->late_probe(card); |