Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp932618ybt; Wed, 17 Jun 2020 18:16:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyh0GW9Ei5hy5gNlhYtSzSSHjpvG1fene5zU7WcDddBGByoTXbbY1KsoRBghv8VbF2j4p41 X-Received: by 2002:a05:6402:3069:: with SMTP id bs9mr1755246edb.194.1592442965524; Wed, 17 Jun 2020 18:16:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592442965; cv=none; d=google.com; s=arc-20160816; b=wn6J7EmiyyhFaZCUthhmibxXin8qmjgxpb5hd+ASDYDTHu+6xhjOxjKlmBcpnv+kVg RXcV+ZDiEa+pc0QQ60oUiGG8rkf+E+eUepCLQkcTdzOMJUm+6sXggMQuv8cw0ijPlDyu 1ZxrnKHW7d6YlO3Larvw48/pEk2tzQJ9MeL3Y8rCM96AUlKHHd3ze25FjXCnFDPkluMf 76f2qTwrGYiEcZShspN38pmu8Yvg3PnW74/ALhvqX4M6+bNtmuEP1a1W2vHl1A0bAahO PAr6/imfdgu0AdNjl+Lz47NwFxBh87448UqysB2hJ4MjjTFWLgVU9T8gR25k4p0Eeo+V 5AtQ== 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=7Hun46a+LQkmjKMkFm9Q7dRaTJVefvyKkbDfUTLwXvg=; b=FxVEk4wpRdgBmqNdKMM3GSTG4jYnqZDDfRfRdnXvPZmvffIdwIGuVRnfHZPKEH4mkQ IG7T761dkWaRCyLfJROl1qYOcY58Q8+Km8dLS2z8r2erib+0JHp7/G3qIoMJZ9teVZbk Fm5p20Kq+BeAINEBeyONdZ8EaVsUgO/Y0elrcpVMIBXniz1BB045/eV4rpmfHgOdGxMb dXxcGuHLnO+Tap6rgkYOogTJ3/6N3x+JDQSbUkPFYuEOMeWgwlbhTl1jNHK0Hmq5d8Ch LyWwySD8iUVNf91DbxmkJJf85BSEos00X5mhonJZir0On0efxV/T4wTMuktqhytSlSTw Ed6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XWaF37sJ; 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 p16si951512ejj.708.2020.06.17.18.15.43; Wed, 17 Jun 2020 18:16:05 -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=XWaF37sJ; 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 S1729157AbgFRBNg (ORCPT + 99 others); Wed, 17 Jun 2020 21:13:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:41058 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728909AbgFRBM2 (ORCPT ); Wed, 17 Jun 2020 21:12:28 -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 357CD20EDD; Thu, 18 Jun 2020 01:12:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442748; bh=D3F8OeDLQgHlOhxrNCZPhck53CQnJDDLhPaT7YaAwrI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XWaF37sJvBryMdy7DM/uqodwaiskEYnqZum8Uumx51IGDc4P0zQUgYMlohe5+aDb4 esyO1TFdik4NS8iQGoJudPBFZAlnaEr4gatkZcZRSQLu2o/oh2pm0XuYFW/WwgoWDN RV6iNiP3Zyfq0vQbsXotVRyb8VFnP9m+a3Y7pJGo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Yongjun , Alan Stern , Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 200/388] USB: ohci-sm501: fix error return code in ohci_hcd_sm501_drv_probe() Date: Wed, 17 Jun 2020 21:04:57 -0400 Message-Id: <20200618010805.600873-200-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: Wei Yongjun [ Upstream commit b919e077cccfbb77beb98809568b2fb0b4d113ec ] Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 7d9e6f5aebe8 ("usb: host: ohci-sm501: init genalloc for local memory") Signed-off-by: Wei Yongjun Acked-by: Alan Stern Link: https://lore.kernel.org/r/20200506135625.106910-1-weiyongjun1@huawei.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/ohci-sm501.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c index c158cda9e4b9..cff965240327 100644 --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c @@ -157,9 +157,10 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev) * the call to usb_hcd_setup_local_mem() below does just that. */ - if (usb_hcd_setup_local_mem(hcd, mem->start, - mem->start - mem->parent->start, - resource_size(mem)) < 0) + retval = usb_hcd_setup_local_mem(hcd, mem->start, + mem->start - mem->parent->start, + resource_size(mem)); + if (retval < 0) goto err5; retval = usb_add_hcd(hcd, irq, IRQF_SHARED); if (retval) -- 2.25.1