Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6C4644062A; Thu, 20 Aug 2026 17:50:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787248253; cv=none; b=GWMzomeFqifQf9zSlETEksdQ1qiXa1lhEB3k6YGSvuw6Z8EcUDrdA1IepKnmgfbtlWqP6bNvmeYl8Liwndt7DZaeYEuarivgQtFgGU+13Ie4nklfYBMXlMxORXYk0GRyKTj0qRxYEjvdDNAFcyUSa0j85xO1DMyLuo+wQHg4FZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787248253; c=relaxed/simple; bh=qic1zTTBfH98F+KJwK4fbqooIiHGhaDmiOQInFsGI0Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vF1usP7oJFJSiJZ+XOFPqKmrSbYnQFt/AbE4ny+h/1G4E3YGPnkO1ZXREzkIHq1NjDfEMwnG12bHfugTUGOoyZ8LWJvtbcOZeuijypjrEnNevAKH5DtdNaKc1cqVbcG/DYC4k3VGmVF1AX2FtiMYuhQtGQxusE//Y/iXPsq9gmg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LtiU8cbq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LtiU8cbq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EA841F000E9; Thu, 20 Aug 2026 17:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787248252; bh=uIOfgeVlR+ds3Ed/LKyuUEec+CRW6tfrlJiQqm/Yi80=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LtiU8cbqu7x5mLnPvlK/yOyr6K17wyBZph6M8qM4FvRLHaPOrMuKXIuRPp9DCH6TK cM/4k0mSKlD0y0GP7s4XAJ2VtbM7CD1gS/G1g+dWCCAd1T9X3xVELyHQpwbRK/mKA/ wWEJZICghqFQlc8YQOc01Sj9sP9L9/XdIGFitLLg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johan Hovold , Ulf Hansson Subject: [PATCH 6.1 146/303] mmc: vub300: rename probe error labels Date: Thu, 20 Aug 2026 16:54:42 +0200 Message-ID: <20260820145257.672070790@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145253.200766705@linuxfoundation.org> References: <20260820145253.200766705@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold Error labels should be named after what they do. Rename the probe error labels. Signed-off-by: Johan Hovold Signed-off-by: Ulf Hansson (cherry picked from commit 5b8b35d6f4fa758dd5e8ae18526ea1c73f6787e0) Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/vub300.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) --- a/drivers/mmc/host/vub300.c +++ b/drivers/mmc/host/vub300.c @@ -2116,19 +2116,19 @@ static int vub300_probe(struct usb_inter command_out_urb = usb_alloc_urb(0, GFP_KERNEL); if (!command_out_urb) { retval = -ENOMEM; - goto error0; + goto err_put_udev; } command_res_urb = usb_alloc_urb(0, GFP_KERNEL); if (!command_res_urb) { retval = -ENOMEM; - goto error1; + goto err_free_out_urb; } /* this also allocates memory for our VUB300 mmc host device */ mmc = mmc_alloc_host(sizeof(struct vub300_mmc_host), &udev->dev); if (!mmc) { retval = -ENOMEM; dev_err(&udev->dev, "not enough memory for the mmc_host\n"); - goto error4; + goto err_free_res_urb; } /* MMC core transfer sizes tunable parameters */ mmc->caps = 0; @@ -2345,23 +2345,25 @@ static int vub300_probe(struct usb_inter interface_to_InterfaceNumber(interface)); retval = mmc_add_host(mmc); if (retval) - goto error6; + goto err_delete_timer; return 0; -error6: - del_timer_sync(&vub300->inactivity_timer); + +err_delete_timer: + timer_delete_sync(&vub300->inactivity_timer); err_free_host: mmc_free_host(mmc); /* * and hence also frees vub300 * which is contained at the end of struct mmc */ -error4: +err_free_res_urb: usb_free_urb(command_res_urb); -error1: +err_free_out_urb: usb_free_urb(command_out_urb); -error0: +err_put_udev: usb_put_dev(udev); + return retval; }