Merge branch 'fix/asoc' into for-linus

[firefly-linux-kernel-4.4.55.git] / sound / atmel / abdac.c

diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c
index 28b3c7f7cfe63fba02a91d81be644d96ffcc9f7a..6e24091818950edc9c298241be2d28a751b39f83 100644 (file)
--- a/sound/atmel/abdac.c
+++ b/sound/atmel/abdac.c
@@ -165,7 +165,7 @@ static struct snd_pcm_hardware atmel_abdac_hw = {
        .buffer_bytes_max       = 64 * 4096,
        .period_bytes_min       = 4096,
        .period_bytes_max       = 4096,
-       .periods_min            = 4,
+       .periods_min            = 6,
        .periods_max            = 64,
 };
 
@@ -420,9 +420,9 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev)
                return PTR_ERR(pclk);
        }
        sample_clk = clk_get(&pdev->dev, "sample_clk");
-       if (IS_ERR(pclk)) {
+       if (IS_ERR(sample_clk)) {
                dev_dbg(&pdev->dev, "no sample clock\n");
-               retval = PTR_ERR(pclk);
+               retval = PTR_ERR(sample_clk);
                goto out_put_pclk;
        }
        clk_enable(pclk);
@@ -502,7 +502,7 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, card);
 
        dev_info(&pdev->dev, "Atmel ABDAC at 0x%p using %s\n",
-                       dac->regs, dac->dma.chan->dev->device.bus_id);
+                       dac->regs, dev_name(&dac->dma.chan->dev->device));
 
        return retval;