Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / sound / soc / mxs / mxs-saif.c

diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 231d7e7b07110d9e219788810acf70d62f1e00c6..d9865082160cbe6b2081a5c2748c04e048343459 100644 (file)
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -773,7 +773,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
 
        saif->dev = &pdev->dev;
        ret = devm_request_irq(&pdev->dev, saif->irq, mxs_saif_irq, 0,
-                              "mxs-saif", saif);
+                              dev_name(&pdev->dev), saif);
        if (ret) {
                dev_err(&pdev->dev, "failed to request irq\n");
                return ret;
@@ -815,7 +815,6 @@ static struct platform_driver mxs_saif_driver = {
 
        .driver = {
                .name = "mxs-saif",
-               .owner = THIS_MODULE,
                .of_match_table = mxs_saif_dt_ids,
        },
 };