Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-microblaze.git] / drivers / rpmsg / mtk_rpmsg.c

diff --git a/drivers/rpmsg/mtk_rpmsg.c b/drivers/rpmsg/mtk_rpmsg.c
index 83f2b88..96a17ec 100644 (file)
--- a/drivers/rpmsg/mtk_rpmsg.c
+++ b/drivers/rpmsg/mtk_rpmsg.c
@@ -200,7 +200,6 @@ static int mtk_rpmsg_register_device(struct mtk_rpmsg_rproc_subdev *mtk_subdev,
        struct rpmsg_device *rpdev;
        struct mtk_rpmsg_device *mdev;
        struct platform_device *pdev = mtk_subdev->pdev;
-       int ret;
 
        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
        if (!mdev)
@@ -219,13 +218,7 @@ static int mtk_rpmsg_register_device(struct mtk_rpmsg_rproc_subdev *mtk_subdev,
        rpdev->dev.parent = &pdev->dev;
        rpdev->dev.release = mtk_rpmsg_release_device;
 
-       ret = rpmsg_register_device(rpdev);
-       if (ret) {
-               kfree(mdev);
-               return ret;
-       }
-
-       return 0;
+       return rpmsg_register_device(rpdev);
 }
 
 static void mtk_register_device_work_function(struct work_struct *register_work)