Commit 5a4cfce7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38 

Conflicts:
	sound/soc/soc-core.c

Axel's fix on two different branches.
parents 6b3ed785 2a7b1a00

sound/soc/codecs/wm8580.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -491,16 +491,16 @@ static int wm8580_paif_hw_params(struct snd_pcm_substream *substream, 
		paifa |= 0x8;

		paifa |= 0x8;

		break;

		break;

	case SNDRV_PCM_FORMAT_S20_3LE:

	case SNDRV_PCM_FORMAT_S20_3LE:

		paifa |= 0x10;

		paifa |= 0x0;

		paifb |= WM8580_AIF_LENGTH_20;

		paifb |= WM8580_AIF_LENGTH_20;

		break;

		break;

	case SNDRV_PCM_FORMAT_S24_LE:

	case SNDRV_PCM_FORMAT_S24_LE:

		paifa |= 0x10;

		paifa |= 0x0;

		paifb |= WM8580_AIF_LENGTH_24;

		paifb |= WM8580_AIF_LENGTH_24;

		break;

		break;

	case SNDRV_PCM_FORMAT_S32_LE:

	case SNDRV_PCM_FORMAT_S32_LE:

		paifa |= 0x10;

		paifa |= 0x0;

		paifb |= WM8580_AIF_LENGTH_24;

		paifb |= WM8580_AIF_LENGTH_32;

		break;

		break;

	default:

	default:

		return -EINVAL;

		return -EINVAL;

sound/soc/codecs/wm8962.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3339,7 +3339,7 @@ static irqreturn_t wm8962_irq(int irq, void *data) 
	int mask;

	int mask;

	int active;

	int active;





	mask = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2);

	mask = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2_MASK);





	active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2);

	active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2);

	active &= ~mask;

	active &= ~mask;