Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

diff --combined sound/soc/soc-core.c
index a3adbf06b1e5e6dc1d2f51efa2a0213ae4dc9083,0af3bbde5bbe30f0cb359050d131f27ae1a55859,ad381138fc2e482e0bf0110a96cf32c385ba8c04..16c7453f494691cd3f75b6d6fe4ef5b45c339c84
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
--- 3/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@@ -4,7 -4,7 -4,8 +4,7 @@@@
    * Copyright 2005 Wolfson Microelectronics PLC.
    * Copyright 2005 Openedhand Ltd.
    *
  - * Author: Liam Girdwood
  - *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
  + * Author: Liam Girdwood <lrg@slimlogic.co.uk>
    *         with code, comments and ideas from :-
    *         Richard Purdie <richard@openedhand.com>
    *
@@@@ -95,8 -95,8 -96,8 +95,8 @@@@ static int soc_ac97_dev_register(struc
        codec->ac97->dev.parent = NULL;
        codec->ac97->dev.release = soc_ac97_device_release;
   
- -     snprintf(codec->ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s",
- -              codec->card->number, 0, codec->name);
+ +     dev_set_name(&codec->ac97->dev, "%d-%d:%s",
+ +                  codec->card->number, 0, codec->name);
        err = device_register(&codec->ac97->dev);
        if (err < 0) {
                snd_printk(KERN_ERR "Can't register ac97 bus\n");
@@@@ -1462,7 -1462,7 -1463,7 +1462,7 @@@@ int snd_soc_info_volsw(struct snd_kcont
        struct soc_mixer_control *mc =
                (struct soc_mixer_control *)kcontrol->private_value;
        int max = mc->max;
 --     unsigned int shift = mc->min;
 ++     unsigned int shift = mc->shift;
        unsigned int rshift = mc->rshift;
   
        if (max == 1)
@@@@ -1885,7 -1885,7 -1886,7 +1885,7 @@@@ module_init(snd_soc_init)
   module_exit(snd_soc_exit);
   
   /* Module information */
  -MODULE_AUTHOR("Liam Girdwood, liam.girdwood@wolfsonmicro.com, www.wolfsonmicro.com");
  +MODULE_AUTHOR("Liam Girdwood, lrg@slimlogic.co.uk");
   MODULE_DESCRIPTION("ALSA SoC Core");
   MODULE_LICENSE("GPL");
   MODULE_ALIAS("platform:soc-audio");