Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756013Ab1BWWGu (ORCPT ); Wed, 23 Feb 2011 17:06:50 -0500 Received: from smtp-out.google.com ([216.239.44.51]:50182 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753902Ab1BWWGt (ORCPT ); Wed, 23 Feb 2011 17:06:49 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=google.com; s=beta; h=message-id:date:from:user-agent:mime-version:newsgroups:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; b=bc+upgVgSh/0vTrDfVxZdmyVCzNc6bBGxr8wpPbHne7wJuOqKHnWc6f7VkVSwOlrZ3 uQMGV5LvPKe9c+o0iyew== Message-ID: <4D6584F2.1010109@google.com> Date: Wed, 23 Feb 2011 14:06:42 -0800 From: Mike Waychison User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7 MIME-Version: 1.0 Newsgroups: gmane.linux.kernel To: Wim Van Sebroeck CC: LKML , Linux Watchdog Mailing List , Alan Cox Subject: Re: [RFC] [PATCH 6/10] Generic Watchdog Timer Driver References: <20110223204350.GA7433@infomag.iguana.be> In-Reply-To: <20110223204350.GA7433@infomag.iguana.be> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1672 Lines: 41 On 02/23/11 12:43, Wim Van Sebroeck wrote: > commit afe3de93859443b575407f39a2e655956c02e088 > Author: Wim Van Sebroeck > Date: Sun Jul 18 10:39:00 2010 +0000 > > watchdog: WatchDog Timer Driver Core - Part 6 > > Since we don't want that a driver module can be removed > while the watchdog timer is still active, we lock the > driver module (by incremeting the reference counter). > After a clean close of the watchdog driver we unlock the > driver module. > If /dev/watchdog is closed uncleanly (and the watchdog is > still active) then we do not unlock the driver module, > but keep it, so that next time /dev/watchdog get's opened > we can continue triggering the watchdog. > > Signed-off-by: Alan Cox > Signed-off-by: Wim Van Sebroeck > *snip* > diff --git a/drivers/watchdog/core/watchdog_core.c b/drivers/watchdog/core/watchdog_core.c > index 52bc520..d1a824e 100644 > --- a/drivers/watchdog/core/watchdog_core.c > +++ b/drivers/watchdog/core/watchdog_core.c > @@ -60,6 +60,10 @@ int register_watchdogdevice(struct watchdog_device *wdd) > if (wdd == NULL || wdd->info == NULL || wdd->ops == NULL) > return -ENODATA; > > + /* Make sure that the owner of the watchdog operations exists */ > + if (wdd->ops->owner == NULL) > + return -ENODATA; This check is invalid when the driver is built in. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/