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/hid/hid-picolcd_cir.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kernel/drivers/hid/hid-picolcd_cir.c') diff --git a/kernel/drivers/hid/hid-picolcd_cir.c b/kernel/drivers/hid/hid-picolcd_cir.c index 045f8ebf1..96286510f 100644 --- a/kernel/drivers/hid/hid-picolcd_cir.c +++ b/kernel/drivers/hid/hid-picolcd_cir.c @@ -145,7 +145,6 @@ void picolcd_exit_cir(struct picolcd_data *data) struct rc_dev *rdev = data->rc_dev; data->rc_dev = NULL; - if (rdev) - rc_unregister_device(rdev); + rc_unregister_device(rdev); } -- cgit 1.2.3-korg