From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 13 Oct 2016 08:34:29 +0000 (-0300)
Subject: [media] RedRat3: Return directly after a failed kcalloc() in redrat3_transmit_ir()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fac59136bc22fd9b3a04ed4f29977da8e045ee6b;p=linux-beck.git

[media] RedRat3: Return directly after a failed kcalloc() in redrat3_transmit_ir()

* Return directly after a call of the function "kcalloc" failed
  at the beginning.

* Reorder two calls for the function "kfree" at the end.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---

diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index 342a85d02887..966f43a7e2c2 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -777,10 +777,8 @@ static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf,
 	sample_lens = kcalloc(RR3_DRIVER_MAXLENS,
 			      sizeof(*sample_lens),
 			      GFP_KERNEL);
-	if (!sample_lens) {
-		ret = -ENOMEM;
-		goto out;
-	}
+	if (!sample_lens)
+		return -ENOMEM;
 
 	irdata = kzalloc(sizeof(*irdata), GFP_KERNEL);
 	if (!irdata) {
@@ -848,8 +846,8 @@ static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf,
 		ret = count;
 
 out:
-	kfree(sample_lens);
 	kfree(irdata);
+	kfree(sample_lens);
 
 	rr3->transmitting = false;
 	/* rr3 re-enables rc detector because it was enabled before */