Merge branch 'topic/atmel' into for-linus

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c
index 28b3c7f7cfe6..f2f41c854221 100644
--- 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,
 };
 
@@ -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;