Merge "msm: mdss: support probe defer in writeback driver" (ed0fd4fe) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_wb.c

+10 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -142,12 +142,12 @@ static int mdss_wb_probe(struct platform_device *pdev)

		rc = !mdss_wb_parse_dt(pdev, pdata);
		if (!rc)
		return rc;
		goto error_no_mem;

		rc = mdss_wb_dev_init(wb_ctrl);
		if (rc) {
		dev_err(&pdev->dev, "unable to set up device nodes for writeback panel\n");
		return rc;
		goto error_no_mem;
		}

		pdata->panel_info.type = WRITEBACK_PANEL;
		@@ -161,10 +161,16 @@ static int mdss_wb_probe(struct platform_device *pdev)
		rc = mdss_register_panel(pdev, pdata);
		if (rc) {
		dev_err(&pdev->dev, "unable to register writeback panel\n");
		return rc;
		goto error_init;
		}

		return rc;

		error_init:
		mdss_wb_dev_uninit(wb_ctrl);
		error_no_mem:
		devm_kfree(&pdev->dev, wb_ctrl);
		return rc;
		}

		static int mdss_wb_remove(struct platform_device *pdev)