Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4437ecdc7190302ed02fb1467c116aff29c325b2

Authored by Peter Ujfalusi
Committed by Takashi Iwai
1 parent 1a4e34e67c
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ALSA: core: Allow card id change to the same string 

When user want to change the card id to the same string
on the card via /sys/class/sound/cardX/id, do not
report error. Instead return with success without
doing anything.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 7 additions and 2 deletions Side-by-side Diff

... ... @@ -607,11 +607,16 @@
607 607 return -EEXIST;
608 608 }
609 609 for (idx = 0; idx < snd_ecards_limit; idx++) {
610   - if (snd_cards[idx] && !strcmp(snd_cards[idx]->id, buf1))
611   - goto __exist;
  610 + if (snd_cards[idx] && !strcmp(snd_cards[idx]->id, buf1)) {
  611 + if (card == snd_cards[idx])
  612 + goto __ok;
  613 + else
  614 + goto __exist;
  615 + }
612 616 }
613 617 strcpy(card->id, buf1);
614 618 snd_info_card_id_change(card);
  619 +__ok:
615 620 mutex_unlock(&snd_card_mutex);
616 621  
617 622 return count;