From 2c6ef841eefef5963c8b068db7fd02c0584923ce Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Fri, 16 Nov 2012 18:51:01 +0100 Subject: [PATCH] --- yaml --- r: 344647 b: refs/heads/master c: 4ee9a5377b7888fae8aa6064e4cc8d0fd32871a2 h: refs/heads/master i: 344645: a4edca1446afa0ce54d647dec5d18673faaa22df 344643: 26cd47bb8198f8f05b0e434168e24a35dd242c2b 344639: e4669a84552a07f510a8fbd93ae1f4ec076cbb3e v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/omapfb/omapfb-main.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c7deb7d70d79..e0855ae12859 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8 +refs/heads/master: 4ee9a5377b7888fae8aa6064e4cc8d0fd32871a2 diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c index 408a3cce47ad..1a69d7ca92e5 100644 --- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c +++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c @@ -2445,7 +2445,6 @@ static int __init omapfb_probe(struct platform_device *pdev) fbdev->dev = &pdev->dev; platform_set_drvdata(pdev, fbdev); - r = 0; fbdev->num_displays = 0; dssdev = NULL; for_each_dss_dev(dssdev) { @@ -2468,9 +2467,6 @@ static int __init omapfb_probe(struct platform_device *pdev) d->update_mode = OMAPFB_AUTO_UPDATE; } - if (r) - goto cleanup; - if (fbdev->num_displays == 0) { dev_err(&pdev->dev, "no displays\n"); r = -EINVAL;