From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65A77C433DF for ; Tue, 23 Jun 2020 21:16:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 35B1E2072E for ; Tue, 23 Jun 2020 21:16:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592946967; bh=H6VJ9obbYArUMYvO6qBOQtEXRyWgkm6Xs/Q/wVa/QvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TftjtWDpbN2fId7tt3u0Kqr70UDw5yzFuyeamT6SrGLseEaRZfMtFCk+HX0fHYbfw vct9UeXVnkjtR3ACOqNfUuSE6r8u/XMzr1+41l17JjMvAk6iVSJj/ZpMaiqRxkp16L Tf+N1AAgPWNDw5jr6aTz4XF2ClIPkmq4XjzlmXDA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390534AbgFWU2H (ORCPT ); Tue, 23 Jun 2020 16:28:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:47846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390842AbgFWU2H (ORCPT ); Tue, 23 Jun 2020 16:28:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DC167206EB; Tue, 23 Jun 2020 20:28:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944087; bh=H6VJ9obbYArUMYvO6qBOQtEXRyWgkm6Xs/Q/wVa/QvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GYYkUD1VZdPGxxL9/VaRq0icDWH+X+s2KtIikIqLPvU/ltqqGsRhHGLFYqmWQNmcO R5lzQoU57UKJPNBxRDTlZKNOWP2bKWXN6vAIFSvAmDKhxpFFLYm9K+9iUwo+sPtkGp R1Y+QwOhJW9pSr4QOYKNT/QHBk4KL+ss+1/+FKiI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , Alan Stern , Sasha Levin Subject: [PATCH 5.4 137/314] USB: ohci-sm501: fix error return code in ohci_hcd_sm501_drv_probe() Date: Tue, 23 Jun 2020 21:55:32 +0200 Message-Id: <20200623195345.404071620@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195338.770401005@linuxfoundation.org> References: <20200623195338.770401005@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 c158cda9e4b9b..cff9652403270 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