ASoC: OMAP-McBSP: ASoC interface for McBSP sidetone

[safe/jmp/linux-2.6] / sound / atmel / ac97c.c

diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 90527c1..0c0f877 100644 (file)
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -856,7 +856,7 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
                chip->dma.rx_chan = dma_request_channel(mask, filter, dws);
 
                dev_info(&chip->pdev->dev, "using %s for DMA RX\n",
-                                       chip->dma.rx_chan->dev->device.bus_id);
+                               dev_name(&chip->dma.rx_chan->dev->device));
                set_bit(DMA_RX_CHAN_PRESENT, &chip->flags);
        }
 
@@ -872,7 +872,7 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
                chip->dma.tx_chan = dma_request_channel(mask, filter, dws);
 
                dev_info(&chip->pdev->dev, "using %s for DMA TX\n",
-                                       chip->dma.tx_chan->dev->device.bus_id);
+                               dev_name(&chip->dma.tx_chan->dev->device));
                set_bit(DMA_TX_CHAN_PRESENT, &chip->flags);
        }
 
@@ -969,6 +969,10 @@ static int __devexit atmel_ac97c_remove(struct platform_device *pdev)
        if (gpio_is_valid(chip->reset_pin))
                gpio_free(chip->reset_pin);
 
+       ac97c_writel(chip, CAMR, 0);
+       ac97c_writel(chip, COMR, 0);
+       ac97c_writel(chip, MR,   0);
+
        clk_disable(chip->pclk);
        clk_put(chip->pclk);
        iounmap(chip->regs);