From patchwork Wed Jun 12 13:08:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 2710061 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 585299F1E2 for ; Wed, 12 Jun 2013 13:09:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3137820217 for ; Wed, 12 Jun 2013 13:09:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2ACDD201FC for ; Wed, 12 Jun 2013 13:09:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753401Ab3FLNJI (ORCPT ); Wed, 12 Jun 2013 09:09:08 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:42860 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751483Ab3FLNJH (ORCPT ); Wed, 12 Jun 2013 09:09:07 -0400 Received: by mail-wg0-f46.google.com with SMTP id c11so3400186wgh.25 for ; Wed, 12 Jun 2013 06:09:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=saO3cuwGPrYA2sfKucti0+ZuZju6+6CUDxWuB6FII74=; b=JjTrt6/HHUZPOAPXCu3nftatROYz6aEv5VepyxLPkaQY9uMU1wzO+73oaZW1VagTUa ON6S/fHd1V59u4k0kTs7B3rZsTWWaZtrU1Pj5M2W58dmPAhGrJ8lHNdfK1exbuw0b9Vt vnqWN0aXmfxsJqAsWQV8rCBgyLdhsDQvrkG9pbFHQ0L5r0otudkFelyHElD1ETR2r9Fb Bn1iV6LayeFvaKLrf1Y35yFJaYyk9OD7P3vzJmUSb9A7EYgfmxbAnD9tiOYZvNaAHRmk kByWfBdMoMQB0S0sSWvWlOsRv+1nNlEq9SyKzF9DulgEmz+e1NnF/AB0LD5NenhVL1K2 vrdA== X-Received: by 10.194.58.11 with SMTP id m11mr9821034wjq.45.1371042546427; Wed, 12 Jun 2013 06:09:06 -0700 (PDT) Received: from mai.home (AToulouse-654-1-404-219.w82-125.abo.wanadoo.fr. [82.125.3.219]) by mx.google.com with ESMTPSA id x13sm24555864wib.3.2013.06.12.06.09.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Jun 2013 06:09:05 -0700 (PDT) From: Daniel Lezcano To: rjw@sisk.pl Cc: linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org, patches@linaro.org Subject: [PATCH 8/8] cpuidle: Check the device is not already registered Date: Wed, 12 Jun 2013 15:08:55 +0200 Message-Id: <1371042535-22630-8-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371042535-22630-1-git-send-email-daniel.lezcano@linaro.org> References: <1371042535-22630-1-git-send-email-daniel.lezcano@linaro.org> X-Gm-Message-State: ALoCoQmEXtCZAzLmdLPTxfzscTfG+sgdggQkUXHJo02x4VHJk06h/BDEQ1pKEoPRlIuCKzl2i7mx Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a sanity check for cpuidle_register_device by testing if the device was already registered or not. Signed-off-by: Daniel Lezcano --- drivers/cpuidle/cpuidle.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 7c3f625..59b697877 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -400,13 +400,16 @@ static int __cpuidle_register_device(struct cpuidle_device *dev) */ int cpuidle_register_device(struct cpuidle_device *dev) { - int ret; + int ret = -EBUSY; if (!dev) return -EINVAL; mutex_lock(&cpuidle_lock); + if (dev->registered) + goto out_unlock; + ret = __cpuidle_device_init(dev); if (ret) goto out_unlock;