From mboxrd@z Thu Jan 1 00:00:00 1970 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 70F9A382F01; Thu, 30 Jul 2026 15:53:44 +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=1785426825; cv=none; b=C5uSvFcEYnrHuQ5M0tbb+hsonaLjv8asAciAXViMiv646uVn2qC/HOwtCewBNBjRoBfGFyqwfDY4CNZob5ESWvWV7cePZxuqqm/FMTqA1GfA6Ta3NU5O5HA1gNI6TQcclRuQ+p2zk8kB4EZFazXNK3jU/Pcmu8/JHtfSUcx8mKs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785426825; c=relaxed/simple; bh=0lKumO7oDB2oWgrhOAEwJgG8kqsfdzUJBzttlyAAd2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oxfc27NlN3bibAkfsZeHamngDVBFxqGOPCgioetz0raHuOuNlwcxxYVniQuAKYkdDyQzkL2CQTjCIFORFezq2dgxKXj/blRYLI9RZSgyCb89mo//s3C502rknJPC6+dGu2mR4MdofZOWN5IQLLbIl+smqdwX9tPKffsg1YJT+zs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QLprxHyh; 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="QLprxHyh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 812ED1F000E9; Thu, 30 Jul 2026 15:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785426824; bh=G5gMC3dENBWyXec4KgLCN+m5oo7aJb3BO+a/BngAnLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QLprxHyhsx6UAnDnGQLLN+BHb5eEvM1H1SAbd8/CLTu18ldCDkg2jTYhEMQL/uVkq 1kP8f29qph/vgBWwqjQqzWS/II0IkHPu6NYGc+2gw4LO1PWN9rrmP4XJRtBbwxEJBu aFHBaU31XvsjDGhKXCGWPN72bI5HOesHVooS+BP0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johan Hovold , Ulf Hansson Subject: [PATCH 6.12 554/602] mmc: vub300: rename probe error labels Date: Thu, 30 Jul 2026 16:15:46 +0200 Message-ID: <20260730141447.677938319@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141435.976815864@linuxfoundation.org> References: <20260730141435.976815864@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.12-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 @@ -2114,19 +2114,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; @@ -2343,23 +2343,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; }