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

Commit 67884e21 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.35' into for-2.6.36

parents 1a01eff1 5b61ea49

sound/soc/davinci/davinci-mcasp.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -612,7 +612,6 @@ static void davinci_hw_common_param(struct davinci_audio_dev *dev, int stream) 
								NUMDMA_MASK);

								NUMDMA_MASK);

		mcasp_mod_bits(dev->base + DAVINCI_MCASP_WFIFOCTL,

		mcasp_mod_bits(dev->base + DAVINCI_MCASP_WFIFOCTL,

				((dev->txnumevt * tx_ser) << 8), NUMEVT_MASK);

				((dev->txnumevt * tx_ser) << 8), NUMEVT_MASK);

		mcasp_set_bits(dev->base + DAVINCI_MCASP_WFIFOCTL, FIFO_ENABLE);

	}

	}





	if (dev->rxnumevt && stream == SNDRV_PCM_STREAM_CAPTURE) {

	if (dev->rxnumevt && stream == SNDRV_PCM_STREAM_CAPTURE) {
@@ -623,7 +622,6 @@ static void davinci_hw_common_param(struct davinci_audio_dev *dev, int stream) 
								NUMDMA_MASK);

								NUMDMA_MASK);

		mcasp_mod_bits(dev->base + DAVINCI_MCASP_RFIFOCTL,

		mcasp_mod_bits(dev->base + DAVINCI_MCASP_RFIFOCTL,

				((dev->rxnumevt * rx_ser) << 8), NUMEVT_MASK);

				((dev->rxnumevt * rx_ser) << 8), NUMEVT_MASK);

		mcasp_set_bits(dev->base + DAVINCI_MCASP_RFIFOCTL, FIFO_ENABLE);

	}

	}

}

}