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

Commit 2d0a1dbf authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into for-linus

parents ab669967 ff8bd64e

sound/atmel/ac97c.c

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev) 
	if (sr & AC97C_SR_CAEVT) {

		struct snd_pcm_runtime *runtime;

		int offset, next_period, block_size;

		dev_info(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n",

		dev_dbg(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n",

				casr & AC97C_CSR_OVRUN   ? " OVRUN"   : "",

				casr & AC97C_CSR_RXRDY   ? " RXRDY"   : "",

				casr & AC97C_CSR_UNRUN   ? " UNRUN"   : "",

sound/spi/at73c213.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ struct snd_at73c213 { 
	int				irq;

	int				period;

	unsigned long			bitrate;

	struct clk			*bitclk;

	struct ssc_device		*ssc;

	struct spi_device		*spi;

	u8				spi_wbuffer[2];