tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

* 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6:
ASoC: fixup oops in generic AC97 codec glue
ASoC: fix params_rate() macro use in several codecs
ASoC: fsi-ak4642: Remove ak4642_add_i2c_device

Linus Torvalds f843b0fc c5974b83

+27 -51
+6
sound/soc/codecs/ac97.c
··· 102 102 INIT_LIST_HEAD(&codec->dapm_widgets); 103 103 INIT_LIST_HEAD(&codec->dapm_paths); 104 104 105 + ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); 106 + if (ret < 0) { 107 + printk(KERN_ERR "ASoC: failed to init gen ac97 glue\n"); 108 + goto err; 109 + } 110 + 105 111 /* register pcms */ 106 112 ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); 107 113 if (ret < 0)
+7 -7
sound/soc/codecs/wm8510.c
··· 424 424 425 425 /* filter coefficient */ 426 426 switch (params_rate(params)) { 427 - case SNDRV_PCM_RATE_8000: 427 + case 8000: 428 428 adn |= 0x5 << 1; 429 429 break; 430 - case SNDRV_PCM_RATE_11025: 430 + case 11025: 431 431 adn |= 0x4 << 1; 432 432 break; 433 - case SNDRV_PCM_RATE_16000: 433 + case 16000: 434 434 adn |= 0x3 << 1; 435 435 break; 436 - case SNDRV_PCM_RATE_22050: 436 + case 22050: 437 437 adn |= 0x2 << 1; 438 438 break; 439 - case SNDRV_PCM_RATE_32000: 439 + case 32000: 440 440 adn |= 0x1 << 1; 441 441 break; 442 - case SNDRV_PCM_RATE_44100: 443 - case SNDRV_PCM_RATE_48000: 442 + case 44100: 443 + case 48000: 444 444 break; 445 445 } 446 446
+7 -7
sound/soc/codecs/wm8940.c
··· 378 378 iface |= (1 << 9); 379 379 380 380 switch (params_rate(params)) { 381 - case SNDRV_PCM_RATE_8000: 381 + case 8000: 382 382 addcntrl |= (0x5 << 1); 383 383 break; 384 - case SNDRV_PCM_RATE_11025: 384 + case 11025: 385 385 addcntrl |= (0x4 << 1); 386 386 break; 387 - case SNDRV_PCM_RATE_16000: 387 + case 16000: 388 388 addcntrl |= (0x3 << 1); 389 389 break; 390 - case SNDRV_PCM_RATE_22050: 390 + case 22050: 391 391 addcntrl |= (0x2 << 1); 392 392 break; 393 - case SNDRV_PCM_RATE_32000: 393 + case 32000: 394 394 addcntrl |= (0x1 << 1); 395 395 break; 396 - case SNDRV_PCM_RATE_44100: 397 - case SNDRV_PCM_RATE_48000: 396 + case 44100: 397 + case 48000: 398 398 break; 399 399 } 400 400 ret = snd_soc_write(codec, WM8940_ADDCNTRL, addcntrl);
+7 -7
sound/soc/codecs/wm8974.c
··· 482 482 483 483 /* filter coefficient */ 484 484 switch (params_rate(params)) { 485 - case SNDRV_PCM_RATE_8000: 485 + case 8000: 486 486 adn |= 0x5 << 1; 487 487 break; 488 - case SNDRV_PCM_RATE_11025: 488 + case 11025: 489 489 adn |= 0x4 << 1; 490 490 break; 491 - case SNDRV_PCM_RATE_16000: 491 + case 16000: 492 492 adn |= 0x3 << 1; 493 493 break; 494 - case SNDRV_PCM_RATE_22050: 494 + case 22050: 495 495 adn |= 0x2 << 1; 496 496 break; 497 - case SNDRV_PCM_RATE_32000: 497 + case 32000: 498 498 adn |= 0x1 << 1; 499 499 break; 500 - case SNDRV_PCM_RATE_44100: 501 - case SNDRV_PCM_RATE_48000: 500 + case 44100: 501 + case 48000: 502 502 break; 503 503 } 504 504
-30
sound/soc/sh/fsi-ak4642.c
··· 42 42 .codec_dev = &soc_codec_dev_ak4642, 43 43 }; 44 44 45 - #define AK4642_BUS 0 46 - #define AK4642_ADR 0x12 47 - static int ak4642_add_i2c_device(void) 48 - { 49 - struct i2c_board_info info; 50 - struct i2c_adapter *adapter; 51 - struct i2c_client *client; 52 - 53 - memset(&info, 0, sizeof(struct i2c_board_info)); 54 - info.addr = AK4642_ADR; 55 - strlcpy(info.type, "ak4642", I2C_NAME_SIZE); 56 - 57 - adapter = i2c_get_adapter(AK4642_BUS); 58 - if (!adapter) { 59 - printk(KERN_DEBUG "can't get i2c adapter\n"); 60 - return -ENODEV; 61 - } 62 - 63 - client = i2c_new_device(adapter, &info); 64 - i2c_put_adapter(adapter); 65 - if (!client) { 66 - printk(KERN_DEBUG "can't add i2c device\n"); 67 - return -ENODEV; 68 - } 69 - 70 - return 0; 71 - } 72 - 73 45 static struct platform_device *fsi_snd_device; 74 46 75 47 static int __init fsi_ak4642_init(void) 76 48 { 77 49 int ret = -ENOMEM; 78 - 79 - ak4642_add_i2c_device(); 80 50 81 51 fsi_snd_device = platform_device_alloc("soc-audio", -1); 82 52 if (!fsi_snd_device)