Merge remote-tracking branches 'asoc/topic/doc', 'asoc/topic/dwc', 'asoc/topic/fsi...

[linux-2.6-block.git] / sound / soc / fsl / fsl_asrc.c

diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index 026a80117540be10568d92d2d95f000295c7074c..c068494bae305caaf1015f92636e32e16e475a55 100644 (file)
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -818,7 +818,6 @@ static int fsl_asrc_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        asrc_priv->pdev = pdev;
-       strncpy(asrc_priv->name, np->name, sizeof(asrc_priv->name) - 1);
 
        /* Get the addresses and IRQ */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -837,12 +836,12 @@ static int fsl_asrc_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
-               dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
+               dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
                return irq;
        }
 
        ret = devm_request_irq(&pdev->dev, irq, fsl_asrc_isr, 0,
-                              asrc_priv->name, asrc_priv);
+                              dev_name(&pdev->dev), asrc_priv);
        if (ret) {
                dev_err(&pdev->dev, "failed to claim irq %u: %d\n", irq, ret);
                return ret;