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

Commit 41544f9f authored by Tyler Baker's avatar Tyler Baker Committed by Olof Johansson
Browse files

reset: sunxi: fix spinlock initialization 

Call spin_lock_init() before the spinlocks are used, both in early init
and probe functions preventing a lockdep splat.

I have been observing lockdep complaining [1] during boot on my a80 optimus [2]
when CONFIG_PROVE_LOCKING has been enabled. This patch resolves the splat,
and has been tested on a few other sunxi platforms without issue.

[1] http://storage.kernelci.org/next/next-20150107/arm-multi_v7_defconfig+CONFIG_PROVE_LOCKING=y/lab-tbaker/boot-sun9i-a80-optimus.html
[2] http://kernelci.org/boot/?a80-optimus



Signed-off-by: default avatarTyler Baker <tyler.baker@linaro.org>
Cc: <stable@vger.kernel.org>
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent a30e9318

drivers/reset/reset-sunxi.c

+4 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ static int sunxi_reset_init(struct device_node *np) 
		goto err_alloc;

	}



	spin_lock_init(&data->lock);



	data->rcdev.owner = THIS_MODULE;

	data->rcdev.nr_resets = size * 32;

	data->rcdev.ops = &sunxi_reset_ops;
@@ -157,6 +159,8 @@ static int sunxi_reset_probe(struct platform_device *pdev) 
	if (IS_ERR(data->membase))

		return PTR_ERR(data->membase);



	spin_lock_init(&data->lock);



	data->rcdev.owner = THIS_MODULE;

	data->rcdev.nr_resets = resource_size(res) * 32;

	data->rcdev.ops = &sunxi_reset_ops;