summaryrefslogtreecommitdiffstats
path: root/drivers/media/tuners
diff options
context:
space:
mode:
authorRoman Smirnov <r.smirnov@omp.ru>2024-07-16 12:10:40 +0300
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2024-08-09 07:56:38 +0200
commite25cc4be4616fcf5689622b3226d648aab253cdb (patch)
tree59ddc2d9706879987196981e7cb5cc61abf400ad /drivers/media/tuners
parent74e07a9a26a49ab60ee8ef09238c63ff461dfdd0 (diff)
downloadlinux-e25cc4be4616fcf5689622b3226d648aab253cdb.tar.gz
linux-e25cc4be4616fcf5689622b3226d648aab253cdb.tar.bz2
linux-e25cc4be4616fcf5689622b3226d648aab253cdb.zip
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@ispras.ru> Signed-off-by: Roman Smirnov <r.smirnov@omp.ru> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'drivers/media/tuners')
-rw-r--r--drivers/media/tuners/tuner-i2c.h4
1 files changed, 1 insertions, 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; \