From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964995AbbJHQ5X (ORCPT ); Thu, 8 Oct 2015 12:57:23 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:57642 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964923AbbJHQ5T (ORCPT ); Thu, 8 Oct 2015 12:57:19 -0400 From: Grygorii Strashko To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Alan Stern CC: Pavel Machek , Len Brown , , , Grygorii Strashko , Thierry Reding Subject: [PATCH 1/2] PM / sleep: ensure deferred probe workqueue is finished in wait_for_device_probe Date: Thu, 8 Oct 2015 11:57:06 -0500 Message-ID: <1444323427-6822-2-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1444323427-6822-1-git-send-email-grygorii.strashko@ti.com> References: <1444323427-6822-1-git-send-email-grygorii.strashko@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now wait_for_device_probe() waits for currently executing probes to finish, but it doesn't take into account deferred probing mechanism. As result, nothing prevents deferred probe workqueue to continue probing devices right after wait_for_device_probe() is finished. Hence, lest ensure deferred probe workqueue is finished in wait_for_device_probe() before proceeding. Cc: Alan Stern Cc: Rafael J. Wysocki Cc: Thierry Reding Signed-off-by: Grygorii Strashko --- drivers/base/dd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index be0eb46..98de1a5 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -391,6 +391,10 @@ int driver_probe_done(void) */ void wait_for_device_probe(void) { + /* wait for the deferred probe workqueue to finish */ + if (driver_deferred_probe_enable) + flush_workqueue(deferred_wq); + /* wait for the known devices to complete their probing */ wait_event(probe_waitqueue, atomic_read(&probe_count) == 0); async_synchronize_full(); -- 2.5.1