diff options
-rw-r--r-- | sound/soc/generic/simple-card.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 7cabcc5c8703..5dd47691ba41 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c | |||
@@ -287,7 +287,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev) | |||
287 | } | 287 | } |
288 | 288 | ||
289 | if (!cinfo->name || | 289 | if (!cinfo->name || |
290 | !cinfo->card || | ||
291 | !cinfo->codec_dai.name || | 290 | !cinfo->codec_dai.name || |
292 | !cinfo->codec || | 291 | !cinfo->codec || |
293 | !cinfo->platform || | 292 | !cinfo->platform || |
@@ -296,7 +295,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) | |||
296 | return -EINVAL; | 295 | return -EINVAL; |
297 | } | 296 | } |
298 | 297 | ||
299 | priv->snd_card.name = cinfo->card; | 298 | priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name; |
300 | dai_link->name = cinfo->name; | 299 | dai_link->name = cinfo->name; |
301 | dai_link->stream_name = cinfo->name; | 300 | dai_link->stream_name = cinfo->name; |
302 | dai_link->platform_name = cinfo->platform; | 301 | dai_link->platform_name = cinfo->platform; |