From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757533Ab3BFP5G (ORCPT ); Wed, 6 Feb 2013 10:57:06 -0500 Received: from mailout39.mail01.mtsvc.net ([216.70.64.83]:38034 "EHLO n12.mail01.mtsvc.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757330Ab3BFP5B (ORCPT ); Wed, 6 Feb 2013 10:57:01 -0500 From: Peter Hurley To: George Spelvin , Greg Kroah-Hartman , Rodolfo Giometti Cc: Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Hurley Subject: [PATCH 2/4] pps: Don't crash the machine when exiting will do Date: Wed, 6 Feb 2013 10:55:14 -0500 Message-Id: <1360166116-30797-3-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360166116-30797-1-git-send-email-peter@hurleysoftware.com> References: <20130204010303.24971.qmail@science.horizon.com> <1360166116-30797-1-git-send-email-peter@hurleysoftware.com> X-Authenticated-User: 125194 peter@hurleysoftware.com X-MT-ID: 8fa290c2a27252aacf65dbc4a42f3ce3735fb2a4 X-MT-INTERNAL-ID: 8fa290c2a27252aacf65dbc4a42f3ce3735fb2a4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PPS is not really the must-have subsystem that warrants crashing the machine if the ldisc interface is broken. Signed-off-by: Peter Hurley --- drivers/pps/clients/pps-ldisc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pps/clients/pps-ldisc.c b/drivers/pps/clients/pps-ldisc.c index 27d7ca1..0b91d91 100644 --- a/drivers/pps/clients/pps-ldisc.c +++ b/drivers/pps/clients/pps-ldisc.c @@ -25,6 +25,7 @@ #include #include #include +#include #define PPS_TTY_MAGIC 0x0001 @@ -35,7 +36,8 @@ static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status) pps_get_ts(&ts); - BUG_ON(pps == NULL); + if (WARN_ON_ONCE(pps == NULL)) + return; /* Now do the PPS event report */ pps_event(pps, &ts, status ? PPS_CAPTUREASSERT : -- 1.8.1.2