From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752044AbdBOOdA (ORCPT ); Wed, 15 Feb 2017 09:33:00 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:35030 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751679AbdBOObk (ORCPT ); Wed, 15 Feb 2017 09:31:40 -0500 From: Andrey Drobyshev To: linux-kernel@vger.kernel.org Cc: gq@cs.msu.su, giometti@enneenne.com Subject: [PATCH 5/8] LinuxPPS: pps_parport: Do not generate assert in case of lost signal. Date: Wed, 15 Feb 2017 17:31:06 +0300 Message-Id: <1487169069-15721-6-git-send-email-immortalguardian1@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1487169069-15721-1-git-send-email-immortalguardian1@gmail.com> References: <1487169069-15721-1-git-send-email-immortalguardian1@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander GQ Gerasiov Since clear timeout is non-zero, some clear event capture is requested. Therefore, if signal is lost we shouldn't generate assert event alone. Signed-off-by: Alexander GQ Gerasiov --- drivers/pps/clients/pps_parport.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pps/clients/pps_parport.c b/drivers/pps/clients/pps_parport.c index 83797d8..37094b0 100644 --- a/drivers/pps/clients/pps_parport.c +++ b/drivers/pps/clients/pps_parport.c @@ -96,7 +96,7 @@ static void parport_irq(void *handle) if (!signal_is_set(port)) { local_irq_restore(flags); dev_err(dev->pps->dev, "lost the signal\n"); - goto out_assert; + goto out_none; } /* poll the port until the signal is unset */ @@ -118,6 +118,9 @@ static void parport_irq(void *handle) dev->cw_err = 0; } +out_none: + return; + out_assert: /* fire assert event */ pps_event(dev->pps, &ts_assert, -- 2.1.4