From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932443Ab1BYJth (ORCPT <rfc822;w@1wt.eu>);
	Fri, 25 Feb 2011 04:49:37 -0500
Received: from mailrelay010.isp.belgacom.be ([195.238.6.177]:3886 "EHLO
	mailrelay010.isp.belgacom.be" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S932371Ab1BYJtf (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 25 Feb 2011 04:49:35 -0500
X-Belgacom-Dynamic: yes
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AvsEANsJZ01R8iRz/2dsb2JhbACmOXW9Dw2FUwQ
Date: Fri, 25 Feb 2011 10:49:28 +0100
From: Wim Van Sebroeck <wim@iguana.be>
To: Mike Waychison <mikew@google.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
        Linux Watchdog Mailing List <linux-watchdog@vger.kernel.org>,
        Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: Re: [RFC] [PATCH 3/10] Generic Watchdog Timer Driver
Message-ID: <20110225094928.GQ3790@infomag.iguana.be>
References: <20110223204253.GA7385@infomag.iguana.be> <4D657F24.2000402@google.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4D657F24.2000402@google.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Mike,

>> diff --git a/drivers/watchdog/core/watchdog_dev.c b/drivers/watchdog/core/watchdog_dev.c
>> index ad08a93..0d2ed1d 100644
>> --- a/drivers/watchdog/core/watchdog_dev.c
>> +++ b/drivers/watchdog/core/watchdog_dev.c
>> @@ -151,6 +151,11 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
>>   		return put_user(val, p);
>>   	case WDIOC_GETBOOTSTATUS:
>>   		return put_user(wdd->bootstatus, p);
>> +	case WDIOC_KEEPALIVE:
>> +		if (!(wdd->info->options&  WDIOF_MAGICCLOSE))
>
> Is this meant to be WDIOF_KEEPALIVEPING ?

Yes it is. Fixed this in my code.

Thanks,
Wim.