Merge branch 'linus' into patchwork

[pandora-kernel.git] / drivers / media / platform / s5p-mfc / s5p_mfc.c

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index d12faa6..a130dcd 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1424,7 +1424,7 @@ static void *mfc_get_drv_data(struct platform_device *pdev)
 
        if (pdev->dev.of_node) {
                const struct of_device_id *match;
-               match = of_match_node(of_match_ptr(exynos_mfc_match),
+               match = of_match_node(exynos_mfc_match,
                                pdev->dev.of_node);
                if (match)
                        driver_data = (struct s5p_mfc_variant *)match->data;