[PATCH V2] media: v4l2-pci-skeleton: Fix error handling path in 'skeleton_probe()'

From	Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Newsgroups	linux.kernel
Subject	[PATCH V2] media: v4l2-pci-skeleton: Fix error handling path in 'skeleton_probe()'
Date	2017-09-11 19:00 +0200
Message-ID	<uoAdX-5Xi-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

If this memory allocation fails, we must release some resources, as
already done in the code below and above.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
v2: linux-media@vger.kernel.org added in cc
---
 samples/v4l/v4l2-pci-skeleton.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/samples/v4l/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c
index 483e9bca9444..f520e3aef9c6 100644
--- a/samples/v4l/v4l2-pci-skeleton.c
+++ b/samples/v4l/v4l2-pci-skeleton.c
@@ -772,8 +772,10 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	/* Allocate a new instance */
 	skel = devm_kzalloc(&pdev->dev, sizeof(struct skeleton), GFP_KERNEL);
-	if (!skel)
-		return -ENOMEM;
+	if (!skel) {
+		ret = -ENOMEM;
+		goto disable_pci;
+	}
 
 	/* Allocate the interrupt */
 	ret = devm_request_irq(&pdev->dev, pdev->irq,
-- 
2.11.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH V2] media: v4l2-pci-skeleton: Fix error handling path in 'skeleton_probe()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-09-11 19:00 +0200

csiph-web