Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e30b1c98 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: synaptics_dsx: fix mutex init"

parents 55e6316b edea42b2

drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c

+7 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * Copyright (C) 2012 Alexandra Chin <alexandra.chin@tw.synaptics.com>

 * Copyright (C) 2012 Scott Lin <scott.lin@tw.synaptics.com>

 * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2017, 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 as published by
@@ -3704,6 +3704,12 @@ static int synaptics_rmi4_probe(struct platform_device *pdev) 


	rmi4_data->irq = gpio_to_irq(bdata->irq_gpio);



	if (!exp_data.initialized) {

		mutex_init(&exp_data.mutex);

		INIT_LIST_HEAD(&exp_data.list);

		exp_data.initialized = true;

	}



	retval = synaptics_rmi4_irq_enable(rmi4_data, true);

	if (retval < 0) {

		dev_err(&pdev->dev,
@@ -3712,12 +3718,6 @@ static int synaptics_rmi4_probe(struct platform_device *pdev) 
		goto err_enable_irq;

	}



	if (!exp_data.initialized) {

		mutex_init(&exp_data.mutex);

		INIT_LIST_HEAD(&exp_data.list);

		exp_data.initialized = true;

	}



	exp_data.workqueue = create_singlethread_workqueue("dsx_exp_workqueue");

	INIT_DELAYED_WORK(&exp_data.work, synaptics_rmi4_exp_fn_work);

	exp_data.rmi4_data = rmi4_data;