[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20240716091040.93681-1-r.smirnov@omp.ru>
Date: Tue, 16 Jul 2024 12:10:40 +0300
From: Roman Smirnov <r.smirnov@....ru>
To: Mauro Carvalho Chehab <mchehab@...nel.org>
CC: Roman Smirnov <r.smirnov@....ru>, Sergey Shtylyov <s.shtylyov@....ru>,
<linux-media@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<lvc-project@...uxtesting.org>, Fedor Pchelkin <pchelkin@...ras.ru>
Subject: [PATCH] Revert "media: tuners: fix error return code of hybrid_tuner_request_state()"
This reverts commit b9302fa7ed979e84b454e4ca92192cf485a4ed41.
As Fedor Pchelkin pointed out, this commit violates the
convention of using the macro return value, which causes errors.
For example, in functions tda18271_attach(), xc5000_attach(),
simple_tuner_attach().
Link: https://lore.kernel.org/linux-media/20240424202031.syigrtrtipbq5f2l@fpc/
Suggested-by: Fedor Pchelkin <pchelkin@...ras.ru>
Signed-off-by: Roman Smirnov <r.smirnov@....ru>
---
drivers/media/tuners/tuner-i2c.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/media/tuners/tuner-i2c.h b/drivers/media/tuners/tuner-i2c.h
index 07aeead0644a..724952e001cd 100644
--- a/drivers/media/tuners/tuner-i2c.h
+++ b/drivers/media/tuners/tuner-i2c.h
@@ -133,10 +133,8 @@ static inline int tuner_i2c_xfer_send_recv(struct tuner_i2c_props *props,
} \
if (0 == __ret) { \
state = kzalloc(sizeof(type), GFP_KERNEL); \
- if (!state) { \
- __ret = -ENOMEM; \
+ if (NULL == state) \
goto __fail; \
- } \
state->i2c_props.addr = i2caddr; \
state->i2c_props.adap = i2cadap; \
state->i2c_props.name = devname; \
--
2.34.1
Powered by blists - more mailing lists