From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752009AbcADSgj (ORCPT ); Mon, 4 Jan 2016 13:36:39 -0500 Received: from ip83.parkeon.com ([213.152.31.83]:52997 "EHLO mta2.parkeon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751456AbcADSgg (ORCPT ); Mon, 4 Jan 2016 13:36:36 -0500 X-Greylist: delayed 1159 seconds by postgrey-1.27 at vger.kernel.org; Mon, 04 Jan 2016 13:36:36 EST Subject: [PATCH] base/platform: Fix platform drivers with no probe callback (ex alarmtimer) To: Greg Kroah-Hartman , Uwe =?utf-8?q?Kleine-K=C3=B6nig?= From: Martin Fuzzey Cc: linux-kernel@vger.kernel.org Date: Mon, 04 Jan 2016 19:17:08 +0100 Message-ID: <20160104181708.10572.81323.stgit@localhost> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Score: -2.0 (--) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Normally, when a platform driver defines a .probe callback, the result of dev_pm_domain_attach() is ignored unless it is EPROBE_DEFER. However, when a .probe callback is not defined the result of dev_pm_domain_attach() is propagated to the caller. But dev_pm_domain_attach() can return -ENODEV for devices with no power domain. This was causing the alarmtimer .suspend() callback to be ignored and hence alarms not to wake from suspend (since the RTC was not being programmed on suspend). Fixes: b8b2c7d [base/platform: assert that dev_pm_domain callbacks are called unconditionally] Signed-off-by: Martin Fuzzey --- drivers/base/platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 1dd6d3b..61e5b7e 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -513,8 +513,8 @@ static int platform_drv_probe(struct device *_dev) return ret; ret = dev_pm_domain_attach(_dev, true); - if (ret != -EPROBE_DEFER && drv->probe) { - ret = drv->probe(dev); + if (ret != -EPROBE_DEFER) { + ret = drv->probe ? drv->probe(dev) : 0; if (ret) dev_pm_domain_detach(_dev, true); }