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 63E0D42642D for ; Thu, 30 Jul 2026 14:06:21 +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=1785420382; cv=none; b=L+g5T64V5f1JEwaNl9AZF9II8cZ2KnMK7PNIWxnzIEqP4KtAeNaHXv3ai8o7zfwS/oW6ExMFVn0Q0Y3xQUSIqh3W5x0d0mj885D2Zgegv6JKuQoZwlDWOHgPip4yDFoLdRGOWOWMnP4rrI0EgQIMC49zKHXeC9Xeeleapm7oXoU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785420382; c=relaxed/simple; bh=1d/qhWOKauQ0bFv9qCiMOS4ie8ezgbOXAklC529eaIY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sbNH+C/DUz4SWx8u7KyCxMfAj6vyzPj6TtLW3NyklPfzxaKl/9Z3Iv8IukXJgXiJ2tJolkhFZB1ZB/CgE/ZxwPTfjg6+61awa9EW5i/q/pK8xXVjVqHW37h1eWAP9ac3VFe5yBUmcUuhMhddXWMHceXD7pA1PQRPiGkCKd8x+pc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OloIWuLY; 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="OloIWuLY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C892C1F000E9; Thu, 30 Jul 2026 14:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785420381; bh=NDbgzkuZtYBFnwEQzb55rGgCKFDTO9PcttVYKDTTOls=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OloIWuLYVLosFJGBX8gXifjZ652BuLszsPj2ctFLsnPTKwS2/JpOIQhpVDIhH7kRV XzIhB+66mAplo/DtjHwEB5wVnZfPO8Fg9TQ25qkwlR1ixWwCrp+nSlD4sd1SJohpRn houG+tAsW3HmfdnONV1eMSRisqyF3cryZ90isCOMaP6e5JFGWYQsD7n7hfXUJTZmkw BZXxsbKY+EW8c/TOapk+zHbqF01RrHlYVcUjd4LYmWC0/6waaAaDf8UvirK2Cidq86 NADi60Fe6I7aPynvIdTaocKz08MSO3SmaYTCGk/kLFXtRNEGRHAx0S1Ga/+rSXN+8U RkGKPcd34nMrA== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y 1/2] usb: musb: omap2430: clean up probe error handling Date: Thu, 30 Jul 2026 10:06:17 -0400 Message-ID: <20260730140618.2464039-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026072753-efficient-culpable-80d7@gregkh> References: <2026072753-efficient-culpable-80d7@gregkh> 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 [ Upstream commit 51d4b0a44c82e5eff056ef76acd2c3c605a8eb74 ] Using numbered error labels is discouraged (e.g. as it requires renumbering them when adding a new intermediate error path). Rename the error labels after what they do. While at it, drop the redundant platform allocation failure dev_err() as the error would already have been logged by the allocator. Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20250724091910.21092-6-johan@kernel.org Signed-off-by: Greg Kroah-Hartman Stable-dep-of: c947360ae63e ("usb: musb: omap2430: Do not put borrowed of_node in probe") Signed-off-by: Sasha Levin --- drivers/usb/musb/omap2430.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index bf62bd88c4bc..f1506aead4e0 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -318,13 +318,11 @@ static int omap2430_probe(struct platform_device *pdev) glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL); if (!glue) - goto err0; + return -ENOMEM; musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO); - if (!musb) { - dev_err(&pdev->dev, "failed to allocate musb device\n"); - goto err0; - } + if (!musb) + return -ENOMEM; musb->dev.parent = &pdev->dev; musb->dev.dma_mask = &omap2430_dmamask; @@ -348,15 +346,15 @@ static int omap2430_probe(struct platform_device *pdev) pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) - goto err2; + goto err_put_musb; data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); if (!data) - goto err2; + goto err_put_musb; config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL); if (!config) - goto err2; + goto err_put_musb; of_property_read_u32(np, "mode", (u32 *)&pdata->mode); of_property_read_u32(np, "interface-type", @@ -379,7 +377,7 @@ static int omap2430_probe(struct platform_device *pdev) if (!control_pdev) { dev_err(&pdev->dev, "Failed to get control device\n"); ret = -EINVAL; - goto err2; + goto err_put_musb; } glue->control_otghs = &control_pdev->dev; } @@ -455,22 +453,21 @@ static int omap2430_probe(struct platform_device *pdev) ret = platform_device_add(musb); if (ret) { dev_err(&pdev->dev, "failed to register musb device\n"); - goto err3; + goto err_disable_rpm; } of_node_put(np); return 0; -err3: +err_disable_rpm: pm_runtime_disable(glue->dev); err_put_control_otghs: if (!IS_ERR(glue->control_otghs)) put_device(glue->control_otghs); -err2: +err_put_musb: of_node_put(np); platform_device_put(musb); -err0: return ret; } -- 2.53.0