projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
74e07a9
)
Revert "media: tuners: fix error return code of hybrid_tuner_request_state()"
author
Roman Smirnov
<r.smirnov@omp.ru>
Tue, 16 Jul 2024 09:10:40 +0000
(12:10 +0300)
committer
Hans Verkuil
<hverkuil-cisco@xs4all.nl>
Fri, 9 Aug 2024 05:56:38 +0000
(07:56 +0200)
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>
drivers/media/tuners/tuner-i2c.h
patch
|
blob
|
blame
|
history
diff --git
a/drivers/media/tuners/tuner-i2c.h
b/drivers/media/tuners/tuner-i2c.h
index 07aeead0644a31970cc5b92c73247c50414158ee..724952e001cd13d5106d8ff27fd65ee2b2ed4fa9 100644
(file)
--- 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; \