From 008093f97aa9e366ea65e553dd30450e0d916229 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Fri, 15 Feb 2013 15:04:45 -0700 Subject: [PATCH] --- yaml --- r: 354880 b: refs/heads/master c: c3e1becebfe115f827ea2242218c9a8f627c094f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial-tegra.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 684a79253ea2..9efa6d41f617 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0de59b5733d18b0d1974a060860a8b5c1b36a2e +refs/heads/master: c3e1becebfe115f827ea2242218c9a8f627c094f diff --git a/trunk/drivers/tty/serial/serial-tegra.c b/trunk/drivers/tty/serial/serial-tegra.c index 4f5e62989a2b..372de8ade76a 100644 --- a/trunk/drivers/tty/serial/serial-tegra.c +++ b/trunk/drivers/tty/serial/serial-tegra.c @@ -1269,8 +1269,7 @@ static int tegra_uart_probe(struct platform_device *pdev) const struct tegra_uart_chip_data *cdata; const struct of_device_id *match; - match = of_match_device(of_match_ptr(tegra_uart_of_match), - &pdev->dev); + match = of_match_device(tegra_uart_of_match, &pdev->dev); if (!match) { dev_err(&pdev->dev, "Error: No device match found\n"); return -ENODEV; @@ -1361,7 +1360,7 @@ static struct platform_driver tegra_uart_platform_driver = { .remove = tegra_uart_remove, .driver = { .name = "serial-tegra", - .of_match_table = of_match_ptr(tegra_uart_of_match), + .of_match_table = tegra_uart_of_match, .pm = &tegra_uart_pm_ops, }, };