From patchwork Thu Oct 13 17:52:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2192 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp409564wrs; Thu, 13 Oct 2022 11:05:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6G0PztwCCuxS9OjMvbp3cWcXowp5MDLYQsVS41y+HRvER/MozPi+F69n17ePk9oM2o8+qp X-Received: by 2002:a17:902:f693:b0:17f:6974:cf7f with SMTP id l19-20020a170902f69300b0017f6974cf7fmr876682plg.60.1665684300013; Thu, 13 Oct 2022 11:05:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684300; cv=none; d=google.com; s=arc-20160816; b=uVf5ugMjRN1tEjjnicJhLgrq9xoj/eivQl5DtEtw3SUAz7zZgwiHa0hJtXqbF9+87I hVls0VSjhDnvow/QtiPOrIeQyw8FRE3RPizJlyUP6d+VfvQpiYDdq8nl046GCvqBRilw hWEB7qT9QVSyDLpd7DWl31UVHfd/GUBUc6BYilo8nYrHuSkhDxEMl9y6uozMsCKTeeGD 7rRevP9IvUEd2MZhBvGUszonJy5dKRKlX5AGPsYLp3KOlpoe3Tzv4Ak/LjVZcDC/lgnX yfr6pgP241bDe5iKHw2iOLXKNCj/SvFZE9S55a6jwr5/zRuTYABuLg9UaDcWjiPQxe42 +Euw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WiZvM7uySNJ90w4oQaqkcT/hEqiJlqMJeCyoH+WJ4bE=; b=Nb5PfdvPgLThK1EcLKFXWnEiO2XQB9dFzo0JoPRKuo6Ah/CIXghwVb8tnsP30YwJ2g LQsEuQLzEVI+/LCRgAQSFbA2Pi92s8aRsU4vze2gKhzIbcYfDSHZz84PFPhUO/LVnLon r0UHcgLhtpYia6nT/KlNnfL7Ga5F80QhZXamRfg1QrFq9IldFWybWNCvJ4FSnQLc6A9K BfTxpdj2xEF0pT6z24DpzMOkTKznyXZQlERwtUJLZWugstNgVz5eAkioDBqtvwJCsLra Y7fqTkzDo0ImD3marZhzbeaxSYm02OzmpuCO0Ri6nyjYCWQkK9dN3YDvKAC5oziAF+9w zflw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yfMu0Gp7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cj26-20020a056a00299a00b00562aaf29d36si20831366pfb.298.2022.10.13.11.04.47; Thu, 13 Oct 2022 11:04:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yfMu0Gp7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230527AbiJMSDa (ORCPT + 99 others); Thu, 13 Oct 2022 14:03:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230484AbiJMSDC (ORCPT ); Thu, 13 Oct 2022 14:03:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF6BD152C6F; Thu, 13 Oct 2022 11:02:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1650E6194E; Thu, 13 Oct 2022 17:59:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EEA3C433C1; Thu, 13 Oct 2022 17:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683950; bh=DdUGzI2prsvOQgSs5XCjWOCD4D1KUOHY03lBWxbnGn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yfMu0Gp7yesb1UTRu+0H9HaJlvpZQ/8CP4aKbLRkDoLZgFj1yc7ngpzAu5K1aC6mm Cm/6MXprnjbBH1paO7+70IzQXmIhgmM632gD+vCq3l2FCboebl0JOm7no3E2fdw56n H//f/+Xc9QbjgmkisswDWwNAzucV/df3vqC1fAo8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ferry Toth , Andy Shevchenko Subject: [PATCH 5.19 14/33] Revert "USB: fixup for merge issue with "usb: dwc3: Dont switch OTG -> peripheral if extcon is present"" Date: Thu, 13 Oct 2022 19:52:46 +0200 Message-Id: <20221013175145.750236704@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175145.236739253@linuxfoundation.org> References: <20221013175145.236739253@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746596580411889041?= X-GMAIL-MSGID: =?utf-8?q?1746596580411889041?= From: Andy Shevchenko commit 2adc960ce79d3231b02f820daeee434542fe2911 upstream. This reverts commit 8bd6b8c4b1009d7d2662138d6bdc6fe58a9274c5. Prerequisite revert for the reverting of the original commit 0f0101719138. Fixes: 8bd6b8c4b100 ("USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"") Fixes: 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral if extcon is present") Reported-by: Ferry Toth Cc: stable@vger.kernel.org Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth # for Merrifield Link: https://lore.kernel.org/r/20220927155332.10762-2-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc3/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1650,8 +1650,13 @@ static struct extcon_dev *dwc3_get_extco * This device property is for kernel internal use only and * is expected to be set by the glue code. */ - if (device_property_read_string(dev, "linux,extcon-name", &name) == 0) - return extcon_get_extcon_dev(name); + if (device_property_read_string(dev, "linux,extcon-name", &name) == 0) { + edev = extcon_get_extcon_dev(name); + if (!edev) + return ERR_PTR(-EPROBE_DEFER); + + return edev; + } /* * Try to get an extcon device from the USB PHY controller's "port"