Merge branch 'topic/core-cleanup' into for-linus (3374cd1a) · Commits · e / devices / android_kernel_teracube_2e

Documentation/DocBook/writing-an-alsa-driver.tmpl

+17 −10

Original line number	Diff line number	Diff line
		@@ -5518,34 +5518,41 @@ struct _snd_pcm_runtime {
		]]>
		</programlisting>
		</informalexample>

		For the raw data, <structfield>size</structfield> field must be
		set properly. This specifies the maximum size of the proc file access.
		</para>

		<para>
		The callback is much more complicated than the text-file
		version. You need to use a low-level I/O functions such as
		The read/write callbacks of raw mode are more direct than the text mode.
		You need to use a low-level I/O functions such as
		<function>copy_from/to_user()</function> to transfer the
		data.

		<informalexample>
		<programlisting>
		<![CDATA[
		static long my_file_io_read(struct snd_info_entry *entry,
		static ssize_t my_file_io_read(struct snd_info_entry *entry,
		void *file_private_data,
		struct file *file,
		char *buf,
		unsigned long count,
		unsigned long pos)
		size_t count,
		loff_t pos)
		{
		long size = count;
		if (pos + size > local_max_size)
		size = local_max_size - pos;
		if (copy_to_user(buf, local_data + pos, size))
		if (copy_to_user(buf, local_data + pos, count))
		return -EFAULT;
		return size;
		return count;
		}
		]]>
		</programlisting>
		</informalexample>

		If the size of the info entry has been set up properly,
		<structfield>count</structfield> and <structfield>pos</structfield> are
		guaranteed to fit within 0 and the given size.
		You don't have to check the range in the callbacks unless any
		other condition is required.

		</para>

		</chapter>

include/sound/info.h

+12 −12

Original line number	Diff line number	Diff line
		@@ -51,15 +51,15 @@ struct snd_info_entry_ops {
		unsigned short mode, void **file_private_data);
		int (release)(struct snd_info_entry entry,
		unsigned short mode, void *file_private_data);
		long (read)(struct snd_info_entry entry, void *file_private_data,
		ssize_t (read)(struct snd_info_entry entry, void *file_private_data,
		struct file file, char __user buf,
		unsigned long count, unsigned long pos);
		long (write)(struct snd_info_entry entry, void *file_private_data,
		size_t count, loff_t pos);
		ssize_t (write)(struct snd_info_entry entry, void *file_private_data,
		struct file file, const char __user buf,
		unsigned long count, unsigned long pos);
		long long (llseek)(struct snd_info_entry entry,
		size_t count, loff_t pos);
		loff_t (llseek)(struct snd_info_entry entry,
		void file_private_data, struct file file,
		long long offset, int orig);
		loff_t offset, int orig);
		unsigned int (poll)(struct snd_info_entry entry,
		void file_private_data, struct file file,
		poll_table *wait);

sound/atmel/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ config SND_ATMEL_AC97C
		tristate "Atmel AC97 Controller (AC97C) driver"
		select SND_PCM
		select SND_AC97_CODEC
		depends on DW_DMAC && AVR32
		depends on (DW_DMAC && AVR32) \|\| ARCH_AT91
		help
		ALSA sound driver for the Atmel AC97 controller.

sound/atmel/ac97c.c

+266 −89

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include <linux/device.h>
		#include <linux/dmaengine.h>
		#include <linux/dma-mapping.h>
		#include <linux/atmel_pdc.h>
		#include <linux/init.h>
		#include <linux/interrupt.h>
		#include <linux/module.h>
		@@ -31,6 +32,10 @@

		#include <linux/dw_dmac.h>

		#include <mach/cpu.h>
		#include <mach/hardware.h>
		#include <mach/gpio.h>

		#include "ac97c.h"

		enum {
		@@ -63,6 +68,7 @@ struct atmel_ac97c {
		u64 cur_format;
		unsigned int cur_rate;
		unsigned long flags;
		int playback_period, capture_period;
		/* Serialize access to opened variable */
		spinlock_t lock;
		void __iomem *regs;
		@@ -242,10 +248,12 @@ static int atmel_ac97c_playback_hw_params(struct snd_pcm_substream *substream,
		if (retval < 0)
		return retval;
		/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */
		if (cpu_is_at32ap7000()) {
		/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */
		if (retval == 1)
		if (test_and_clear_bit(DMA_TX_READY, &chip->flags))
		dw_dma_cyclic_free(chip->dma.tx_chan);

		}
		/* Set restrictions to params. */
		mutex_lock(&opened_mutex);
		chip->cur_rate = params_rate(hw_params);
		@@ -266,9 +274,14 @@ static int atmel_ac97c_capture_hw_params(struct snd_pcm_substream *substream,
		if (retval < 0)
		return retval;
		/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */
		if (cpu_is_at32ap7000()) {
		if (retval < 0)
		return retval;
		/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */
		if (retval == 1)
		if (test_and_clear_bit(DMA_RX_READY, &chip->flags))
		dw_dma_cyclic_free(chip->dma.rx_chan);
		}

		/* Set restrictions to params. */
		mutex_lock(&opened_mutex);
		@@ -282,16 +295,20 @@ static int atmel_ac97c_capture_hw_params(struct snd_pcm_substream *substream,
		static int atmel_ac97c_playback_hw_free(struct snd_pcm_substream *substream)
		{
		struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);
		if (cpu_is_at32ap7000()) {
		if (test_and_clear_bit(DMA_TX_READY, &chip->flags))
		dw_dma_cyclic_free(chip->dma.tx_chan);
		}
		return snd_pcm_lib_free_pages(substream);
		}

		static int atmel_ac97c_capture_hw_free(struct snd_pcm_substream *substream)
		{
		struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);
		if (cpu_is_at32ap7000()) {
		if (test_and_clear_bit(DMA_RX_READY, &chip->flags))
		dw_dma_cyclic_free(chip->dma.rx_chan);
		}
		return snd_pcm_lib_free_pages(substream);
		}

		@@ -299,9 +316,11 @@ static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream)
		{
		struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);
		struct snd_pcm_runtime *runtime = substream->runtime;
		int block_size = frames_to_bytes(runtime, runtime->period_size);
		unsigned long word = ac97c_readl(chip, OCA);
		int retval;

		chip->playback_period = 0;
		word &= ~(AC97C_CH_MASK(PCM_LEFT) \| AC97C_CH_MASK(PCM_RIGHT));

		/* assign channels to AC97C channel A */
		@@ -320,10 +339,15 @@ static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream)
		ac97c_writel(chip, OCA, word);

		/* configure sample format and size */
		word = ac97c_readl(chip, CAMR);
		if (chip->opened <= 1)
		word = AC97C_CMR_DMAEN \| AC97C_CMR_SIZE_16;
		else
		word \|= AC97C_CMR_DMAEN \| AC97C_CMR_SIZE_16;

		switch (runtime->format) {
		case SNDRV_PCM_FORMAT_S16_LE:
		if (cpu_is_at32ap7000())
		word \|= AC97C_CMR_CEM_LITTLE;
		break;
		case SNDRV_PCM_FORMAT_S16_BE: /* fall through */
		@@ -363,9 +387,18 @@ static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream)
		dev_dbg(&chip->pdev->dev, "could not set rate %d Hz\n",
		runtime->rate);

		if (cpu_is_at32ap7000()) {
		if (!test_bit(DMA_TX_READY, &chip->flags))
		retval = atmel_ac97c_prepare_dma(chip, substream,
		DMA_TO_DEVICE);
		} else {
		/* Initialize and start the PDC */
		writel(runtime->dma_addr, chip->regs + ATMEL_PDC_TPR);
		writel(block_size / 2, chip->regs + ATMEL_PDC_TCR);
		writel(runtime->dma_addr + block_size,
		chip->regs + ATMEL_PDC_TNPR);
		writel(block_size / 2, chip->regs + ATMEL_PDC_TNCR);
		}

		return retval;
		}
		@@ -374,9 +407,11 @@ static int atmel_ac97c_capture_prepare(struct snd_pcm_substream *substream)
		{
		struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);
		struct snd_pcm_runtime *runtime = substream->runtime;
		int block_size = frames_to_bytes(runtime, runtime->period_size);
		unsigned long word = ac97c_readl(chip, ICA);
		int retval;

		chip->capture_period = 0;
		word &= ~(AC97C_CH_MASK(PCM_LEFT) \| AC97C_CH_MASK(PCM_RIGHT));

		/* assign channels to AC97C channel A */
		@@ -395,10 +430,15 @@ static int atmel_ac97c_capture_prepare(struct snd_pcm_substream *substream)
		ac97c_writel(chip, ICA, word);

		/* configure sample format and size */
		word = ac97c_readl(chip, CAMR);
		if (chip->opened <= 1)
		word = AC97C_CMR_DMAEN \| AC97C_CMR_SIZE_16;
		else
		word \|= AC97C_CMR_DMAEN \| AC97C_CMR_SIZE_16;

		switch (runtime->format) {
		case SNDRV_PCM_FORMAT_S16_LE:
		if (cpu_is_at32ap7000())
		word \|= AC97C_CMR_CEM_LITTLE;
		break;
		case SNDRV_PCM_FORMAT_S16_BE: /* fall through */
		@@ -438,9 +478,18 @@ static int atmel_ac97c_capture_prepare(struct snd_pcm_substream *substream)
		dev_dbg(&chip->pdev->dev, "could not set rate %d Hz\n",
		runtime->rate);

		if (cpu_is_at32ap7000()) {
		if (!test_bit(DMA_RX_READY, &chip->flags))
		retval = atmel_ac97c_prepare_dma(chip, substream,
		DMA_FROM_DEVICE);
		} else {
		/* Initialize and start the PDC */
		writel(runtime->dma_addr, chip->regs + ATMEL_PDC_RPR);
		writel(block_size / 2, chip->regs + ATMEL_PDC_RCR);
		writel(runtime->dma_addr + block_size,
		chip->regs + ATMEL_PDC_RNPR);
		writel(block_size / 2, chip->regs + ATMEL_PDC_RNCR);
		}

		return retval;
		}
		@@ -449,7 +498,7 @@ static int
		atmel_ac97c_playback_trigger(struct snd_pcm_substream *substream, int cmd)
		{
		struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);
		unsigned long camr;
		unsigned long camr, ptcr = 0;
		int retval = 0;

		camr = ac97c_readl(chip, CAMR);
		@@ -458,15 +507,22 @@ atmel_ac97c_playback_trigger(struct snd_pcm_substream *substream, int cmd)
		case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: /* fall through */
		case SNDRV_PCM_TRIGGER_RESUME: /* fall through */
		case SNDRV_PCM_TRIGGER_START:
		if (cpu_is_at32ap7000()) {
		retval = dw_dma_cyclic_start(chip->dma.tx_chan);
		if (retval)
		goto out;
		camr \|= AC97C_CMR_CENA;
		} else {
		ptcr = ATMEL_PDC_TXTEN;
		}
		camr \|= AC97C_CMR_CENA \| AC97C_CSR_ENDTX;
		break;
		case SNDRV_PCM_TRIGGER_PAUSE_PUSH: /* fall through */
		case SNDRV_PCM_TRIGGER_SUSPEND: /* fall through */
		case SNDRV_PCM_TRIGGER_STOP:
		if (cpu_is_at32ap7000())
		dw_dma_cyclic_stop(chip->dma.tx_chan);
		else
		ptcr \|= ATMEL_PDC_TXTDIS;
		if (chip->opened <= 1)
		camr &= ~AC97C_CMR_CENA;
		break;
		@@ -476,6 +532,8 @@ atmel_ac97c_playback_trigger(struct snd_pcm_substream *substream, int cmd)
		}

		ac97c_writel(chip, CAMR, camr);
		if (!cpu_is_at32ap7000())
		writel(ptcr, chip->regs + ATMEL_PDC_PTCR);
		out:
		return retval;
		}
		@@ -484,24 +542,32 @@ static int
		atmel_ac97c_capture_trigger(struct snd_pcm_substream *substream, int cmd)
		{
		struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);
		unsigned long camr;
		unsigned long camr, ptcr = 0;
		int retval = 0;

		camr = ac97c_readl(chip, CAMR);
		ptcr = readl(chip->regs + ATMEL_PDC_PTSR);

		switch (cmd) {
		case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: /* fall through */
		case SNDRV_PCM_TRIGGER_RESUME: /* fall through */
		case SNDRV_PCM_TRIGGER_START:
		if (cpu_is_at32ap7000()) {
		retval = dw_dma_cyclic_start(chip->dma.rx_chan);
		if (retval)
		goto out;
		camr \|= AC97C_CMR_CENA;
		} else {
		ptcr = ATMEL_PDC_RXTEN;
		}
		camr \|= AC97C_CMR_CENA \| AC97C_CSR_ENDRX;
		break;
		case SNDRV_PCM_TRIGGER_PAUSE_PUSH: /* fall through */
		case SNDRV_PCM_TRIGGER_SUSPEND: /* fall through */
		case SNDRV_PCM_TRIGGER_STOP:
		if (cpu_is_at32ap7000())
		dw_dma_cyclic_stop(chip->dma.rx_chan);
		else
		ptcr \|= (ATMEL_PDC_RXTDIS);
		if (chip->opened <= 1)
		camr &= ~AC97C_CMR_CENA;
		break;
		@@ -511,6 +577,8 @@ atmel_ac97c_capture_trigger(struct snd_pcm_substream *substream, int cmd)
		}

		ac97c_writel(chip, CAMR, camr);
		if (!cpu_is_at32ap7000())
		writel(ptcr, chip->regs + ATMEL_PDC_PTCR);
		out:
		return retval;
		}
		@@ -523,7 +591,10 @@ atmel_ac97c_playback_pointer(struct snd_pcm_substream *substream)
		snd_pcm_uframes_t frames;
		unsigned long bytes;

		if (cpu_is_at32ap7000())
		bytes = dw_dma_get_src_addr(chip->dma.tx_chan);
		else
		bytes = readl(chip->regs + ATMEL_PDC_TPR);
		bytes -= runtime->dma_addr;

		frames = bytes_to_frames(runtime, bytes);
		@@ -540,7 +611,10 @@ atmel_ac97c_capture_pointer(struct snd_pcm_substream *substream)
		snd_pcm_uframes_t frames;
		unsigned long bytes;

		if (cpu_is_at32ap7000())
		bytes = dw_dma_get_dst_addr(chip->dma.rx_chan);
		else
		bytes = readl(chip->regs + ATMEL_PDC_RPR);
		bytes -= runtime->dma_addr;

		frames = bytes_to_frames(runtime, bytes);
		@@ -578,8 +652,11 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
		u32 sr = ac97c_readl(chip, SR);
		u32 casr = ac97c_readl(chip, CASR);
		u32 cosr = ac97c_readl(chip, COSR);
		u32 camr = ac97c_readl(chip, CAMR);

		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",
		casr & AC97C_CSR_OVRUN ? " OVRUN" : "",
		casr & AC97C_CSR_RXRDY ? " RXRDY" : "",
		@@ -587,6 +664,50 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
		casr & AC97C_CSR_TXEMPTY ? " TXEMPTY" : "",
		casr & AC97C_CSR_TXRDY ? " TXRDY" : "",
		!casr ? " NONE" : "");
		if (!cpu_is_at32ap7000()) {
		if ((casr & camr) & AC97C_CSR_ENDTX) {
		runtime = chip->playback_substream->runtime;
		block_size = frames_to_bytes(runtime,
		runtime->period_size);
		chip->playback_period++;

		if (chip->playback_period == runtime->periods)
		chip->playback_period = 0;
		next_period = chip->playback_period + 1;
		if (next_period == runtime->periods)
		next_period = 0;

		offset = block_size * next_period;

		writel(runtime->dma_addr + offset,
		chip->regs + ATMEL_PDC_TNPR);
		writel(block_size / 2,
		chip->regs + ATMEL_PDC_TNCR);

		snd_pcm_period_elapsed(
		chip->playback_substream);
		}
		if ((casr & camr) & AC97C_CSR_ENDRX) {
		runtime = chip->capture_substream->runtime;
		block_size = frames_to_bytes(runtime,
		runtime->period_size);
		chip->capture_period++;

		if (chip->capture_period == runtime->periods)
		chip->capture_period = 0;
		next_period = chip->capture_period + 1;
		if (next_period == runtime->periods)
		next_period = 0;

		offset = block_size * next_period;

		writel(runtime->dma_addr + offset,
		chip->regs + ATMEL_PDC_RNPR);
		writel(block_size / 2,
		chip->regs + ATMEL_PDC_RNCR);
		snd_pcm_period_elapsed(chip->capture_substream);
		}
		}
		retval = IRQ_HANDLED;
		}

		@@ -608,15 +729,50 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
		return retval;
		}

		static struct ac97_pcm at91_ac97_pcm_defs[] __devinitdata = {
		/* Playback */
		{
		.exclusive = 1,
		.r = { {
		.slots = ((1 << AC97_SLOT_PCM_LEFT)
		\| (1 << AC97_SLOT_PCM_RIGHT)),
		} },
		},
		/* PCM in */
		{
		.stream = 1,
		.exclusive = 1,
		.r = { {
		.slots = ((1 << AC97_SLOT_PCM_LEFT)
		\| (1 << AC97_SLOT_PCM_RIGHT)),
		} }
		},
		/* Mic in */
		{
		.stream = 1,
		.exclusive = 1,
		.r = { {
		.slots = (1<<AC97_SLOT_MIC),
		} }
		},
		};

		static int __devinit atmel_ac97c_pcm_new(struct atmel_ac97c *chip)
		{
		struct snd_pcm *pcm;
		struct snd_pcm_hardware hw = atmel_ac97c_hw;
		int capture, playback, retval;
		int capture, playback, retval, err;

		capture = test_bit(DMA_RX_CHAN_PRESENT, &chip->flags);
		playback = test_bit(DMA_TX_CHAN_PRESENT, &chip->flags);

		if (!cpu_is_at32ap7000()) {
		err = snd_ac97_pcm_assign(chip->ac97_bus,
		ARRAY_SIZE(at91_ac97_pcm_defs),
		at91_ac97_pcm_defs);
		if (err)
		return err;
		}
		retval = snd_pcm_new(chip->card, chip->card->shortname,
		chip->pdev->id, playback, capture, &pcm);
		if (retval)
		@@ -775,7 +931,12 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
		return -ENXIO;
		}

		if (cpu_is_at32ap7000()) {
		pclk = clk_get(&pdev->dev, "pclk");
		} else {
		pclk = clk_get(&pdev->dev, "ac97_clk");
		}

		if (IS_ERR(pclk)) {
		dev_dbg(&pdev->dev, "no peripheral clock\n");
		return PTR_ERR(pclk);
		@@ -844,6 +1005,7 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
		goto err_ac97_bus;
		}

		if (cpu_is_at32ap7000()) {
		if (pdata->rx_dws.dma_dev) {
		struct dw_dma_slave *dws = &pdata->rx_dws;
		dma_cap_mask_t mask;
		@@ -853,7 +1015,8 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
		dma_cap_zero(mask);
		dma_cap_set(DMA_SLAVE, mask);

		chip->dma.rx_chan = dma_request_channel(mask, filter, dws);
		chip->dma.rx_chan = dma_request_channel(mask, filter,
		dws);

		dev_info(&chip->pdev->dev, "using %s for DMA RX\n",
		dev_name(&chip->dma.rx_chan->dev->device));
		@@ -869,7 +1032,8 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
		dma_cap_zero(mask);
		dma_cap_set(DMA_SLAVE, mask);

		chip->dma.tx_chan = dma_request_channel(mask, filter, dws);
		chip->dma.tx_chan = dma_request_channel(mask, filter,
		dws);

		dev_info(&chip->pdev->dev, "using %s for DMA TX\n",
		dev_name(&chip->dma.tx_chan->dev->device));
		@@ -882,6 +1046,12 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
		retval = -ENODEV;
		goto err_dma;
		}
		} else {
		/* Just pretend that we have DMA channel(for at91 i is actually
		* the PDC) */
		set_bit(DMA_RX_CHAN_PRESENT, &chip->flags);
		set_bit(DMA_TX_CHAN_PRESENT, &chip->flags);
		}

		retval = atmel_ac97c_pcm_new(chip);
		if (retval) {
		@@ -897,12 +1067,13 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)

		platform_set_drvdata(pdev, card);

		dev_info(&pdev->dev, "Atmel AC97 controller at 0x%p\n",
		chip->regs);
		dev_info(&pdev->dev, "Atmel AC97 controller at 0x%p, irq = %d\n",
		chip->regs, irq);

		return 0;

		err_dma:
		if (cpu_is_at32ap7000()) {
		if (test_bit(DMA_RX_CHAN_PRESENT, &chip->flags))
		dma_release_channel(chip->dma.rx_chan);
		if (test_bit(DMA_TX_CHAN_PRESENT, &chip->flags))
		@@ -911,6 +1082,7 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
		clear_bit(DMA_TX_CHAN_PRESENT, &chip->flags);
		chip->dma.rx_chan = NULL;
		chip->dma.tx_chan = NULL;
		}
		err_ac97_bus:
		snd_card_set_dev(card, NULL);

		@@ -934,10 +1106,12 @@ static int atmel_ac97c_suspend(struct platform_device *pdev, pm_message_t msg)
		struct snd_card *card = platform_get_drvdata(pdev);
		struct atmel_ac97c *chip = card->private_data;

		if (cpu_is_at32ap7000()) {
		if (test_bit(DMA_RX_READY, &chip->flags))
		dw_dma_cyclic_stop(chip->dma.rx_chan);
		if (test_bit(DMA_TX_READY, &chip->flags))
		dw_dma_cyclic_stop(chip->dma.tx_chan);
		}
		clk_disable(chip->pclk);

		return 0;
		@@ -949,11 +1123,12 @@ static int atmel_ac97c_resume(struct platform_device *pdev)
		struct atmel_ac97c *chip = card->private_data;

		clk_enable(chip->pclk);
		if (cpu_is_at32ap7000()) {
		if (test_bit(DMA_RX_READY, &chip->flags))
		dw_dma_cyclic_start(chip->dma.rx_chan);
		if (test_bit(DMA_TX_READY, &chip->flags))
		dw_dma_cyclic_start(chip->dma.tx_chan);

		}
		return 0;
		}
		#else
		@@ -978,6 +1153,7 @@ static int __devexit atmel_ac97c_remove(struct platform_device *pdev)
		iounmap(chip->regs);
		free_irq(chip->irq, chip);

		if (cpu_is_at32ap7000()) {
		if (test_bit(DMA_RX_CHAN_PRESENT, &chip->flags))
		dma_release_channel(chip->dma.rx_chan);
		if (test_bit(DMA_TX_CHAN_PRESENT, &chip->flags))
		@@ -986,6 +1162,7 @@ static int __devexit atmel_ac97c_remove(struct platform_device *pdev)
		clear_bit(DMA_TX_CHAN_PRESENT, &chip->flags);
		chip->dma.rx_chan = NULL;
		chip->dma.tx_chan = NULL;
		}

		snd_card_set_dev(card, NULL);
		snd_card_free(card);

sound/core/control.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,10 @@ static int snd_ctl_open(struct inode inode, struct file file)
		struct snd_ctl_file *ctl;
		int err;

		err = nonseekable_open(inode, file);
		if (err < 0)
		return err;

		card = snd_lookup_minor_data(iminor(inode), SNDRV_DEVICE_TYPE_CONTROL);
		if (!card) {
		err = -ENODEV;
		@@ -1388,6 +1392,7 @@ static const struct file_operations snd_ctl_f_ops =
		.read = snd_ctl_read,
		.open = snd_ctl_open,
		.release = snd_ctl_release,
		.llseek = no_llseek,
		.poll = snd_ctl_poll,
		.unlocked_ioctl = snd_ctl_ioctl,
		.compat_ioctl = snd_ctl_ioctl_compat,