Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c5814c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  ALSA: usb-audio: automatically detect feedback format
  ASoC: sound/wm9090: add missing __devexit marker
  ASoC: sound/max98088: add missing __devexit marker
  ASoC: sound/ad73311: add missing __devexit marker
  ASoC: fsl - fix build error in pcm030-audio-fabric.c
  sound/oss/sb_ess.c: delete double assignment
  ALSA: hda - Change BTL amp level on some HP notebooks
parents a042e261 89e1e66d

sound/oss/sb_ess.c

+0 −1
Original line number Diff line number Diff line
@@ -1721,7 +1721,6 @@ printk (KERN_INFO "FKS: es_rec_set_recmask mask = %x\n", mask); 
				left  = value & 0x000000ff;

				right = (value & 0x0000ff00) >> 8;

			} else {				/* Turn it off (3)  */

				left  = 0;

				left  = 0;

				right = 0;

			}

sound/pci/hda/patch_sigmatel.c

+78 −0
Original line number Diff line number Diff line
@@ -5326,6 +5326,82 @@ static int patch_stac92hd73xx(struct hda_codec *codec) 
	return 0;

}



static int stac92hd83xxx_set_system_btl_amp(struct hda_codec *codec)

{

	if (codec->vendor_id != 0x111d7605 &&

	    codec->vendor_id != 0x111d76d1)

		return 0;



	switch (codec->subsystem_id) {

	case 0x103c1618:

	case 0x103c1619:

	case 0x103c161a:

	case 0x103c161b:

	case 0x103c161c:

	case 0x103c161d:

	case 0x103c161e:

	case 0x103c161f:

	case 0x103c1620:

	case 0x103c1621:

	case 0x103c1622:

	case 0x103c1623:



	case 0x103c162a:

	case 0x103c162b:



	case 0x103c1630:

	case 0x103c1631:



	case 0x103c1633:



	case 0x103c1635:



	case 0x103c164f:



	case 0x103c1676:

	case 0x103c1677:

	case 0x103c1678:

	case 0x103c1679:

	case 0x103c167a:

	case 0x103c167b:

	case 0x103c167c:

	case 0x103c167d:

	case 0x103c167e:

	case 0x103c167f:

	case 0x103c1680:

	case 0x103c1681:

	case 0x103c1682:

	case 0x103c1683:

	case 0x103c1684:

	case 0x103c1685:

	case 0x103c1686:

	case 0x103c1687:

	case 0x103c1688:

	case 0x103c1689:

	case 0x103c168a:

	case 0x103c168b:

	case 0x103c168c:

	case 0x103c168d:

	case 0x103c168e:

	case 0x103c168f:

	case 0x103c1690:

	case 0x103c1691:

	case 0x103c1692:



	case 0x103c3587:

	case 0x103c3588:

	case 0x103c3589:

	case 0x103c358a:



	case 0x103c3667:

	case 0x103c3668:

		/* set BTL amp level to 13.43dB for louder speaker output */

		return snd_hda_codec_write_cache(codec, codec->afg, 0,

						 0x7F4, 0x14);

	}

	return 0;

}



static int patch_stac92hd83xxx(struct hda_codec *codec)

{

	struct sigmatel_spec *spec;
@@ -5452,6 +5528,8 @@ static int patch_stac92hd83xxx(struct hda_codec *codec) 
			AC_VERB_SET_CONNECT_SEL, num_dacs);

	}



	stac92hd83xxx_set_system_btl_amp(codec);



	codec->proc_widget_hook = stac92hd_proc_hook;



	return 0;

sound/soc/codecs/ad73311.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static int ad73311_probe(struct platform_device *pdev) 
			&soc_codec_dev_ad73311, &ad73311_dai, 1);

}



static int ad73311_remove(struct platform_device *pdev)

static int __devexit ad73311_remove(struct platform_device *pdev)

{

	snd_soc_unregister_codec(&pdev->dev);

	return 0;

sound/soc/codecs/max98088.c

+1 −1
Original line number Diff line number Diff line
@@ -2051,7 +2051,7 @@ static int max98088_i2c_probe(struct i2c_client *i2c, 
       return ret;

}



static int max98088_i2c_remove(struct i2c_client *client)

static int __devexit max98088_i2c_remove(struct i2c_client *client)

{

       snd_soc_unregister_codec(&client->dev);

       kfree(i2c_get_clientdata(client));

sound/soc/codecs/wm9090.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static int wm9090_i2c_probe(struct i2c_client *i2c, 
	return ret;

}



static int wm9090_i2c_remove(struct i2c_client *i2c)

static int __devexit wm9090_i2c_remove(struct i2c_client *i2c)

{

	struct wm9090_priv *wm9090 = i2c_get_clientdata(i2c);