Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp978549ybt; Wed, 17 Jun 2020 19:45:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQllSR4F7iABLC0OFs9k82orpc5WL4NEbA2nriC0oe0rqd6OyGY87eqsA72eimeQaj5hUX X-Received: by 2002:aa7:d2d9:: with SMTP id k25mr2089323edr.43.1592448302033; Wed, 17 Jun 2020 19:45:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448302; cv=none; d=google.com; s=arc-20160816; b=BRk94wiBDGOM5+2j6Kzgolb8CiO3KwaYA5yBw9HvlHNr4xT3qs1WUAwBDDi1ABKnq5 QYcJu1F2Uu2qazh6ljDktoQi0qheBgBBTfcY1gJ5Z/DjwXBsqxKgb+VUnmg5apwh+bGv 8dfCZ5suKjv9g9BG+r9QaXxx0WgseyOcNLUcNppghtAp+P4tBJLXHOBDHZU1zYW2MkCE EqxZO1uF70EA1jgAgKDnFaZPqZe8ya7yjZ8DtNmWfEC7plyW6CNbvBNbWjh7Xwz20L1c xABd2GFO6whW0LIoZZC4idHA0hJfaADlKf0TSnLhm0PpsaSgmDlVbXHdOgciHf62JDO+ 8Mwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dTWgtyHGMQBS+KXkjFcGeP30mGknxKYcmtB28DT0N6s=; b=AelLW3tcsjwKUuq2JJ1wwJJXXlpXG4nvdmxoacV1IgmjSagesc0nONE84SDoVkdrJR 3MnrhyaXYqpqCHlyQrZCLiZIla7rdeS7Lw4IeThuAA1i1PaGdzVi6APehYEqdP2EDdXF Zffy5ev5LU36zm2UjpLSUjgmfbjARJKwUhUhdnitjRksjrhq1OyqEWht7by5+VV7apPa zLTFtRp8Hra6TVYIouQvSz/JHK4U5crbfohxKPQUb/BvKoX3Ei+/6zlRkdvVXdOymOh+ T/xDsNKL13+nLjWCoMxxpaYYTRm8X8WMcIAsM2MiCUVIdfa6QBvEt4IdEy6LVyAV7jhl iVfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rylOHO3I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b10si1068361edr.286.2020.06.17.19.44.39; Wed, 17 Jun 2020 19:45:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rylOHO3I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387869AbgFRCnB (ORCPT + 99 others); Wed, 17 Jun 2020 22:43:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:39880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727073AbgFRBLr (ORCPT ); Wed, 17 Jun 2020 21:11:47 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 73BAA21D90; Thu, 18 Jun 2020 01:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442707; bh=b81sBAbK71A81s+WrFLaLjIoRHBsG4x73nqY5oFinc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rylOHO3IypF9HJHgRFmxOUWNjhoSL9PE+QrN1xiJzrf+28O+esFi2Bwd0NYucxa3R WMP+p7OgKn6c4HpllCl5RCPKr8c+wsMVyCxU8LiE2c0ThWOYepAmRAxtRwP2XGN6gh hFhCvJGXebvhc9u7jSEU4bnvOugM78GQRS+oMygw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Neil Armstrong , Martin Blumenstingl , Felipe Balbi , Sasha Levin , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: [PATCH AUTOSEL 5.7 168/388] usb: dwc3: meson-g12a: check return of dwc3_meson_g12a_usb_init Date: Wed, 17 Jun 2020 21:04:25 -0400 Message-Id: <20200618010805.600873-168-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Neil Armstrong [ Upstream commit 8f5bc1ec770c2bdc8c604ba4119a77d81d8f3529 ] The dwc3_meson_g12a_usb_init function can return an error, check it. Fixes: c99993376f72ca ("usb: dwc3: Add Amlogic G12A DWC3 glue") Reviewed-by: Martin Blumenstingl Signed-off-by: Neil Armstrong Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/dwc3/dwc3-meson-g12a.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c index b81d085bc534..2d257bdfe848 100644 --- a/drivers/usb/dwc3/dwc3-meson-g12a.c +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c @@ -525,7 +525,9 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) /* Get dr_mode */ priv->otg_mode = usb_get_dr_mode(dev); - dwc3_meson_g12a_usb_init(priv); + ret = dwc3_meson_g12a_usb_init(priv); + if (ret) + goto err_disable_clks; /* Init PHYs */ for (i = 0 ; i < PHY_COUNT ; ++i) { -- 2.25.1