From patchwork Wed Dec 21 20:18:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferry Toth X-Patchwork-Id: 35505 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3726942wrn; Wed, 21 Dec 2022 12:25:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXu2WEK+Qt3Ls5CdTZd7ym+0n3oGhHJOnV88C3E+DabtThCdPwZTEP/Lq9DZ1FyuCNFpOkzx X-Received: by 2002:a17:90a:c213:b0:224:5f8a:52e4 with SMTP id e19-20020a17090ac21300b002245f8a52e4mr3664551pjt.9.1671654342789; Wed, 21 Dec 2022 12:25:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671654342; cv=none; d=google.com; s=arc-20160816; b=mVGKgVZ2Allq5bNJ5pkJIB++/SmgPbs2ip8VkhTNAy++71ce1vhZo6GKxaV7yVq9pR Q0+8kz65AQU05BxXUZMd60Q/pf5R3560yAkp05kcOUq1Cjf3jUi75RPEhxRnCtACyRaF OQwMpjFb5YC9lsffUYJ/k1jEvEsrlPNqrriJd7hv6KaHL9TiaH1dR9qU7abEtSsGthKc bZie84nXU19SxF7H+nGdG1MEfmPD/cZmUCgz2yHG9FpAufLDYATYEER2PKdeR7eOkeG1 uN+aA3KXGLRU8VrkQTjilZTzawLycmpsS0Dl/isiw1CPVtH+9Si/atYyc89vizkkY03F ePtQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=pWO3hqi+QAixwpdeI1+jy7duJrkYMUdLerm7qfnV53A=; b=f+1ZHquelTzNW9QFRleie+v1XbZJUUWgdy0iOsr5V1vhXHufwudzxRQ22B5G2fPdeA nN8TB6u7Vwa5uT5fzgmYTmngVl4Tgyjajs7+yS9sYpOz3wZo04uv6G7Py4E8yfSEh5K0 rA1QFha5v2eDSBSo2AA27bWDnAHoUT7u37Qh3dbShQ6sZFfaUX0ViIXM5V9j2edUoKA8 ksJI5hBeBwj4xPb2/bM7AjWDw2DAWQKCHpvkLSOj7Uh0YCodp4L5KiHWp8KCGd/5Cnhu r6XSgjGyaGjD9Z0BQ1Q1/EHoTU6P3IiDW74kBUyv1nIQNgmuYp+Bz7kVzrpTPX0oB3AM ARSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@exalondelft.nl header.s=whs1 header.b=bt4Sry3a; 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=exalondelft.nl Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pf1-20020a17090b1d8100b00218ceebbcafsi2774280pjb.130.2022.12.21.12.25.29; Wed, 21 Dec 2022 12:25:42 -0800 (PST) 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=@exalondelft.nl header.s=whs1 header.b=bt4Sry3a; 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=exalondelft.nl Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231417AbiLUUSu (ORCPT + 99 others); Wed, 21 Dec 2022 15:18:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbiLUUSr (ORCPT ); Wed, 21 Dec 2022 15:18:47 -0500 Received: from mailfilter05-out40.webhostingserver.nl (mailfilter05-out40.webhostingserver.nl [195.211.74.36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72B4823EA0 for ; Wed, 21 Dec 2022 12:18:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=exalondelft.nl; s=whs1; h=content-transfer-encoding:mime-version:message-id:date:subject:cc:to:from: from; bh=pWO3hqi+QAixwpdeI1+jy7duJrkYMUdLerm7qfnV53A=; b=bt4Sry3aTw0lf00bXdiWU63WNWX2xULSlnLeoMlYGJgIUrA0UaELJreJBK7qG0rqme9vHQccu0DoQ 8d3jK+pqdJdDihGPzjRg4FlbGmDFRo7y3oT5vU/K7Dkd5ui7thxDwpTQOSR2xRnPpbzp8I8FQNCspe hj0dFvmoyiD65Vr2SZ3fTiI1QsZTL/sYxq5Xh8YQr/iK9AMKfK/gXygUtgotOmBL+zuuI6gf9DU7ET SfZZLnuV3uYR/e5rT+4J2382bjF+8WdY28g1ypON7S585DxzeBsvzts5se2S7rpdADrzVsXtn7p/6N 61PBJ40+gS6dIWvhLrArPQBZxs30OFw== X-Halon-ID: e54b552b-816b-11ed-936b-001a4a4cb933 Received: from s198.webhostingserver.nl (s198.webhostingserver.nl [141.138.168.154]) by mailfilter05.webhostingserver.nl (Halon) with ESMTPSA id e54b552b-816b-11ed-936b-001a4a4cb933; Wed, 21 Dec 2022 21:13:12 +0100 (CET) Received: from 2a02-a466-68ed-1-b319-6467-c1bf-a947.fixed6.kpn.net ([2a02:a466:68ed:1:b319:6467:c1bf:a947] helo=delfion.fritz.box) by s198.webhostingserver.nl with esmtpa (Exim 4.96) (envelope-from ) id 1p85Y1-00ELTs-1X; Wed, 21 Dec 2022 21:18:41 +0100 From: Ferry Toth To: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Heikki Krogerus , Greg Kroah-Hartman , Sean Anderson , Liu Shixin , Ferry Toth , Andrey Smirnov , Andy Shevchenko , Ferry Toth , Guenter Roeck , stable@vger.kernel.org Subject: [PATCH v1 1/1] Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" Date: Wed, 21 Dec 2022 21:18:05 +0100 Message-Id: <20221221201805.19436-1-ftoth@exalondelft.nl> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-Antivirus-Scanner: Clean mail though you should still use an Antivirus X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=unavailable 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?1752856624132412682?= X-GMAIL-MSGID: =?utf-8?q?1752856624132412682?= This reverts commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac. This patch results in some qemu test failures, specifically xilinx-zynq-a9 machine and zynq-zc702 as well as zynq-zed devicetree files, when trying to boot from USB drive. Fixes: 8a7b31d545d3 ("usb: ulpi: defer ulpi_register on ulpi_read_id timeout") Reported-by: Guenter Roeck Cc: stable@vger.kernel.org Link: https://lkml.org/lkml/2022/12/20/803 Signed-off-by: Ferry Toth --- drivers/usb/common/ulpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index 60e8174686a1..d7c8461976ce 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -207,7 +207,7 @@ static int ulpi_read_id(struct ulpi *ulpi) /* Test the interface */ ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); if (ret < 0) - return ret; + goto err; ret = ulpi_read(ulpi, ULPI_SCRATCH); if (ret < 0)