From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/drivers/pinctrl/pinctrl-tb10x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel/drivers/pinctrl/pinctrl-tb10x.c') diff --git a/kernel/drivers/pinctrl/pinctrl-tb10x.c b/kernel/drivers/pinctrl/pinctrl-tb10x.c index 160a1f5e9..6546b9bb2 100644 --- a/kernel/drivers/pinctrl/pinctrl-tb10x.c +++ b/kernel/drivers/pinctrl/pinctrl-tb10x.c @@ -807,9 +807,9 @@ static int tb10x_pinctrl_probe(struct platform_device *pdev) } state->pctl = pinctrl_register(&tb10x_pindesc, dev, state); - if (!state->pctl) { + if (IS_ERR(state->pctl)) { dev_err(dev, "could not register TB10x pin driver\n"); - ret = -EINVAL; + ret = PTR_ERR(state->pctl); goto fail; } -- cgit 1.2.3-korg