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 B2FC629C328 for ; Tue, 28 Jul 2026 03:26:08 +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=1785209169; cv=none; b=pjQZqL5XC4eHNHhYk1O7kwEd6q+c5PYFK45kDlOY6U/+LSmnp7SX1K+66pB31A7vU5mRxeebKU11oZ1kOPlr5sR6HavmggBUOHcB4taJiUJBJv3Ev1GNo8fBFU7M8TuResRSHQVed5fGkVLKbDaiCiAt87Z/0zmEusBlQeYSfhg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785209169; c=relaxed/simple; bh=Pir6115otUDez9Ue8l4G3A3hU1T79t3HMpFIYqugucc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NADNPmJl3oLSmTZEEPod2hi4sh0i/elraU4TojXVn1WwDix9VLrDfXs1DwNbRSMxTf6WBvsDfegX0zc25wTqLJXARTFiTB2/yCZ5JP9N2YSRQORcNHvDC49LODWtKoiqL8vT0ZIIJzNvsZy3cm1WraLqcPHgkYlLr1WWLacG38c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=giDCzu8E; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="giDCzu8E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B9021F00A3A; Tue, 28 Jul 2026 03:26:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785209168; bh=q3VhJzM/r2USKmMUGjhWZK7pSjNUZhwoLilzQ4O8Kys=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=giDCzu8EOWHIB8eR6l3OKVnjmU8KVVXfI4ru9nXbmgwCj5Jd7mM3o1I8U2zBhqIVh rQ1VaPzOtai7VnfP9I0+ldy9ZtNxguNF6vwapR5c2AFR9ifUkZ4K5EUHk/GUTB579F Gi1Z4RmAA689MbHfTeG6cKM44Rsq3AdthPMSzfMEVb6C6N2qDE+1AMDqyloBeL7FzB Fv+Uy7LA6y8J0UW5wRPOHBM8f7c1zt8zU5/yUFF/Qg8iLOqzYfUNC2GsDF96dOaFAx 3Uomih7sK19ibHnBgcHaoMxshfGLcc38clnYK9MDxSXpQ8EwzFb3lDouRbfaDpNlEW HOE3BKCB+ICBA== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Ulf Hansson Subject: [PATCH 5.10.y 2/3] mmc: vub300: rename probe error labels Date: Mon, 27 Jul 2026 23:26:04 -0400 Message-ID: <20260728032605.3151542-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260728032605.3151542-1-sashal@kernel.org> References: <2026072048-private-repackage-90f2@gregkh> <20260728032605.3151542-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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) --- drivers/mmc/host/vub300.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c index 4000dc80f81af8..63286a3a7905ea 100644 --- a/drivers/mmc/host/vub300.c +++ b/drivers/mmc/host/vub300.c @@ -2116,19 +2116,19 @@ static int vub300_probe(struct usb_interface *interface, 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_interface *interface, 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; } -- 2.53.0