From patchwork Mon May 17 11:12:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ameya Palande X-Patchwork-Id: 100093 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4HBCpwY026827 for ; Mon, 17 May 2010 11:12:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752730Ab0EQLMt (ORCPT ); Mon, 17 May 2010 07:12:49 -0400 Received: from smtp.nokia.com ([192.100.122.233]:57479 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751522Ab0EQLMt (ORCPT ); Mon, 17 May 2010 07:12:49 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4HBCJdM012661; Mon, 17 May 2010 14:12:45 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 17 May 2010 14:12:41 +0300 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Mon, 17 May 2010 14:12:41 +0300 Received: from localhost.localdomain (esdhcp040115.research.nokia.com [172.21.40.115]) by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4HBCZIZ030870; Mon, 17 May 2010 14:12:36 +0300 From: Ameya Palande To: linux-omap@vger.kernel.org Cc: timo.t.kokkonen@nokia.com, wim@iguana.be Subject: [PATCH] twl4030_wdt: Disable watchdog while probing Date: Mon, 17 May 2010 14:12:15 +0300 Message-Id: <7fcfe2bbdbad2e7c330c219fa1e27497a5fd0f89.1274094577.git.ameya.palande@nokia.com> X-Mailer: git-send-email 1.6.3.3 X-OriginalArrivalTime: 17 May 2010 11:12:41.0434 (UTC) FILETIME=[DDE613A0:01CAF5B1] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 17 May 2010 11:12:51 +0000 (UTC) diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c index dcabe77..b5045ca 100644 --- a/drivers/watchdog/twl4030_wdt.c +++ b/drivers/watchdog/twl4030_wdt.c @@ -190,6 +190,8 @@ static int __devinit twl4030_wdt_probe(struct platform_device *pdev) twl4030_wdt_dev = pdev; + twl4030_wdt_disable(wdt); + ret = misc_register(&wdt->miscdev); if (ret) { dev_err(wdt->miscdev.parent,