From patchwork Fri Jan 11 08:30:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1023448 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dfyuPdFa"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43bbfj4QwXz9sCX; Fri, 11 Jan 2019 19:30:53 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ghsDI-0005Jy-Cx; Fri, 11 Jan 2019 08:30:48 +0000 Received: from mail-pg1-f193.google.com ([209.85.215.193]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ghsDF-0005HP-IM for kernel-team@lists.ubuntu.com; Fri, 11 Jan 2019 08:30:45 +0000 Received: by mail-pg1-f193.google.com with SMTP id v28so6024926pgk.10 for ; Fri, 11 Jan 2019 00:30:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=j0JtBlIIFvLBRw6n9vGE+C3TC2+GhF+15V4fxFZckaM=; b=dfyuPdFajxlN6EJIu8rvugW4eSDMbR4ndUZqTPQNmvkcx8AAGP7eylOQBzMuPZf8ql DE7CZAoXZP/oZSVY0desJfqGgfLWyv7CrX1LcbaoeAp93BfomAVFyWwJ0ALYVD3PraQF 5KycvHzzluVWpCJ+WaqqMiciOvr4OF7cFqFK6VNQaWwdB0DdHtmeBr0gNwbDwYBofxKN KNQkgX/c5E9sVCuMfHG+cU/mpvaBonKQ1TSeRWkrIWZJ+CGal7pu97H1YFTLO4DX3INo Pis6RLy6jHEDRhPKy4mPTcBa1ui5YS01ACVzPTF2GH1gmA4PmN1qXP/50UMdLzQLU23Y rOQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=j0JtBlIIFvLBRw6n9vGE+C3TC2+GhF+15V4fxFZckaM=; b=cgNXFAUwHFHFOeR+NbfcjOabhRly9CCkfk294qq9IfW0G0bfPxN4UFTJAjMdLDxYX2 OZeCantY9MbgJMXtPncMRN1B4UO0TSS+dppFZyIaEgE7GtbBqYv5RMprdRJjc9+N07EC 7FpmdTtW0eTob67PrLuJULnBvYfJ/zHywN4PwFdSKaSyB1SeqJE/S0kwGpbPdYPMIh5u 6FkboI/BCxH7fSP4puMJgrzMLyh74ZQYOM9Zw2JA6jzsv0IqoLFmzo+HD2GoBta0yz73 dcz9XCReLHhxCd/nod7psDVMcXBaY0GyhkdYLeEukQU+QIu9BTNgBp4VSNoz14gwZKxt a0Fg== X-Gm-Message-State: AJcUukfv02XWjgiIuHgem4FWq/yxTpGFy0UGTF+cwgt861WckO8byETd 78j/cN3ZQXXuCEc/IE+fld1+wRR15dk= X-Google-Smtp-Source: ALg8bN5wV19OPoPRb5NT3BFXeesK5w4M2KZjESPFoPFM3GYLjNnypU3lQ0nq/FRDji/1N3i+sFsUmQ== X-Received: by 2002:a65:4784:: with SMTP id e4mr12323753pgs.12.1547195443687; Fri, 11 Jan 2019 00:30:43 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id 186sm150802985pga.36.2019.01.11.00.30.42 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Jan 2019 00:30:42 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 08/12][SRU][B][C][D][OEM-B] memstick: rtsx_usb_ms: Add missing pm_runtime_disable() in probe function Date: Fri, 11 Jan 2019 16:30:15 +0800 Message-Id: <20190111083019.32135-9-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190111083019.32135-1-acelan.kao@canonical.com> References: <20190111083019.32135-1-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kai-Heng Feng BugLink: https://bugs.launchpad.net/bugs/1811337 If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable(). Add missing pm_runtime_disable() for rtsx_usb_ms. Signed-off-by: Kai-Heng Feng Tested-by: Oleksandr Natalenko Signed-off-by: Ulf Hansson (cherry picked from commit 01a7e8e066a505933b43a8df6da1ae1a1e7bddf2) Signed-off-by: AceLan Kao --- drivers/memstick/host/rtsx_usb_ms.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c index 4f64563df7de..e95e64974a91 100644 --- a/drivers/memstick/host/rtsx_usb_ms.c +++ b/drivers/memstick/host/rtsx_usb_ms.c @@ -770,6 +770,7 @@ static int rtsx_usb_ms_drv_probe(struct platform_device *pdev) return 0; err_out: memstick_free_host(msh); + pm_runtime_disable(ms_dev(host)); return err; }