From patchwork Thu Oct 13 11:37:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 9374859 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0A60F60487 for ; Thu, 13 Oct 2016 11:38:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFA4129F29 for ; Thu, 13 Oct 2016 11:38:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3CCC29FF7; Thu, 13 Oct 2016 11:38:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F2F129FEB for ; Thu, 13 Oct 2016 11:38:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755034AbcJMLio (ORCPT ); Thu, 13 Oct 2016 07:38:44 -0400 Received: from mail-lf0-f45.google.com ([209.85.215.45]:33435 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754315AbcJMLia (ORCPT ); Thu, 13 Oct 2016 07:38:30 -0400 Received: by mail-lf0-f45.google.com with SMTP id x79so135043890lff.0 for ; Thu, 13 Oct 2016 04:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hLdjNDVRXxv/9XNHJDdT3CNeHAxDJrjN/Yk8nPEeU0I=; b=IeZdugZrBgAPMHDCck2AV4RuM/RzPDORc74Gkcv7RVHLM+nNze99/6KKyXNY8yPgSb OhRb6wUQHXUSii+bwdSbB/eELkzWXzbD12x8NOoRaSeCqawPUEvGEhPz+Qnp3x12YNvf hOx6E/c97Q9IMz0tYYZDk98jclUok1mqrj/Ps= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hLdjNDVRXxv/9XNHJDdT3CNeHAxDJrjN/Yk8nPEeU0I=; b=OQ1mWPl+FUy0zpyE+5onDq2m5VNmPSvXji6qZw69+0PFyYb2RNYt675KEA9VlWJiJL xp70LNeoLZI0gb2VeTO1IGbzQVi3HeVViigFhR9JtYno1ESfVlExX2eNlz5/xRM5R3mH ReAOIX+52hF0qH1ZW/HJTFOiD1a3sKsoF3uEeXl/7Vc80DgOCPl6GW2HNQsm09kBX8KP fcXCW5+7eXjgdyoVujEbygf2oxvRowleTNbTQ0okUlM8/kj7NiSrIVz4BlkQ/CzlEq0U vTmtzygCJh/fNi26CEGx3088b20+/9FnSjkzz62J5KAWbSe66sPlm2WMR74KJh4S54jn wB0A== X-Gm-Message-State: AA6/9RmfcM1koBp8Z7hjESgdWJLEcrCbhiuS0AxnOXAwVfWKSr/79SodF4XQR6NF89/R69O+ X-Received: by 10.25.18.97 with SMTP id h94mr9087509lfi.106.1476358674031; Thu, 13 Oct 2016 04:37:54 -0700 (PDT) Received: from localhost.localdomain (h-155-4-221-67.na.cust.bahnhof.se. [155.4.221.67]) by smtp.gmail.com with ESMTPSA id p76sm3648114lfd.11.2016.10.13.04.37.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Oct 2016 04:37:52 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Ulf Hansson Cc: Ritesh Raj Sarraf , Alan Stern , Oliver Neukum , USB list , Roger Tseng , Wei WANG , Subject: [PATCH 1/6] mmc: rtsx_usb_sdmmc: Avoid keeping the device runtime resumed when unused Date: Thu, 13 Oct 2016 13:37:35 +0200 Message-Id: <1476358660-8338-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476358660-8338-1-git-send-email-ulf.hansson@linaro.org> References: <1476358660-8338-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The rtsx_usb_sdmmc driver may bail out in its ->set_ios() callback when no SD card is inserted. This is wrong, as it could cause the device to remain runtime resumed when it's unused. Fix this behaviour. Tested-by: Ritesh Raj Sarraf Cc: Cc: Alan Stern Signed-off-by: Ulf Hansson --- drivers/mmc/host/rtsx_usb_sdmmc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index 4106295..e0b8590 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c @@ -1138,11 +1138,6 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) dev_dbg(sdmmc_dev(host), "%s\n", __func__); mutex_lock(&ucr->dev_mutex); - if (rtsx_usb_card_exclusive_check(ucr, RTSX_USB_SD_CARD)) { - mutex_unlock(&ucr->dev_mutex); - return; - } - sd_set_power_mode(host, ios->power_mode); sd_set_bus_width(host, ios->bus_width); sd_set_timing(host, ios->timing, &host->ddr_mode);