Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (367 commits)
  ALSA: ASoC: fix a typo in omp-pcm.c
  ASoC: Fix DSP formats in SSM2602 audio codec
  ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
  ALSA: hda: fix incorrect mixer index values for 92hd83xx
  ALSA: hda: dinput_mux check
  ALSA: hda - Add quirk for another HP dv7
  ALSA: ASoC - Add missing __devexit annotation to wm8350.c
  ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode
  ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
  ALSA: ASoC: tlv320aic3x add dsp_a
  ALSA: ASoC: DaVinci: document I2S limitations
  ALSA: ASoC: DaVinci: davinci-i2s clean up
  ALSA: ASoC: DaVinci: davinci-i2s clean up
  ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
  ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
  ALSA: ca0106 - disable 44.1kHz capture
  ALSA: ca0106 - Add missing card->private_data initialization
  ALSA: ca0106 - Check ac97 availability at PM
  ALSA: hda - Power up always when no jack detection is available
  ALSA: hda - Fix unused variable warnings in patch_sigmatel.c
  ...

1 files changed, 70 insertions, 1 deletions

diff --git a/sound/core/init.c b/sound/core/init.c
index b47ff8b44be8..0d5520c415d3 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -533,6 +533,65 @@ static void choose_default_id(struct snd_card *card)
         }
 }
 
+#ifndef CONFIG_SYSFS_DEPRECATED
+static ssize_t
+card_id_show_attr(struct device *dev,
+                  struct device_attribute *attr, char *buf)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
+        return snprintf(buf, PAGE_SIZE, "%s\n", card ? card->id : "(null)");
+}
+
+static ssize_t
+card_id_store_attr(struct device *dev, struct device_attribute *attr,
+                   const char *buf, size_t count)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
+        char buf1[sizeof(card->id)];
+        size_t copy = count > sizeof(card->id) - 1 ?
+                                        sizeof(card->id) - 1 : count;
+        size_t idx;
+        int c;
+
+        for (idx = 0; idx < copy; idx++) {
+                c = buf[idx];
+                if (!isalnum(c) && c != '_' && c != '-')
+                        return -EINVAL;
+        }
+        memcpy(buf1, buf, copy);
+        buf1[copy] = '\0';
+        mutex_lock(&snd_card_mutex);
+        if (!snd_info_check_reserved_words(buf1)) {
+             __exist:
+                mutex_unlock(&snd_card_mutex);
+                return -EEXIST;
+        }
+        for (idx = 0; idx < snd_ecards_limit; idx++) {
+                if (snd_cards[idx] && !strcmp(snd_cards[idx]->id, buf1))
+                        goto __exist;
+        }
+        strcpy(card->id, buf1);
+        snd_info_card_id_change(card);
+        mutex_unlock(&snd_card_mutex);
+
+        return count;
+}
+
+static struct device_attribute card_id_attrs =
+        __ATTR(id, S_IRUGO | S_IWUSR, card_id_show_attr, card_id_store_attr);
+
+static ssize_t
+card_number_show_attr(struct device *dev,
+                     struct device_attribute *attr, char *buf)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
+        return snprintf(buf, PAGE_SIZE, "%i\n", card ? card->number : -1);
+}
+
+static struct device_attribute card_number_attrs =
+        __ATTR(number, S_IRUGO, card_number_show_attr, NULL);
+#endif /* CONFIG_SYSFS_DEPRECATED */
+
 /**
  *  snd_card_register - register the soundcard
  *  @card: soundcard structure
@@ -553,7 +612,7 @@ int snd_card_register(struct snd_card *card)
 #ifndef CONFIG_SYSFS_DEPRECATED
         if (!card->card_dev) {
                 card->card_dev = device_create(sound_class, card->dev,
-                                               MKDEV(0, 0), NULL,
+                                               MKDEV(0, 0), card,
                                                "card%i", card->number);
                 if (IS_ERR(card->card_dev))
                         card->card_dev = NULL;
@@ -576,6 +635,16 @@ int snd_card_register(struct snd_card *card)
         if (snd_mixer_oss_notify_callback)
                 snd_mixer_oss_notify_callback(card, SND_MIXER_OSS_NOTIFY_REGISTER);
 #endif
+#ifndef CONFIG_SYSFS_DEPRECATED
+        if (card->card_dev) {
+                err = device_create_file(card->card_dev, &card_id_attrs);
+                if (err < 0)
+                        return err;
+                err = device_create_file(card->card_dev, &card_number_attrs);
+                if (err < 0)
+                        return err;
+        }
+#endif
         return 0;
 }