diff options
| author | Mauro Carvalho Chehab | 2018-03-23 11:36:26 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2018-03-23 11:54:32 +0100 |
| commit | d3c449e16fc829dba347dc72106f8d28b15896f9 (patch) | |
| tree | f774d668791c831ec5a317e39430a4090721fd76 /drivers/media/pci/bt8xx | |
| parent | media: tvaudio: improve error handling (diff) | |
| download | kernel-qcow2-linux-d3c449e16fc829dba347dc72106f8d28b15896f9.tar.gz kernel-qcow2-linux-d3c449e16fc829dba347dc72106f8d28b15896f9.tar.xz kernel-qcow2-linux-d3c449e16fc829dba347dc72106f8d28b15896f9.zip | |
media: bttv-input: better handle errors at I2C transfer
The error handling logic at get_key_pv951() is a little bit
akward, with produces this false positive warning:
drivers/media/pci/bt8xx/bttv-input.c:344 get_key_pv951() error: uninitialized symbol 'b'.
Do a cleanup. As a side effect, it also improves its coding
style.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/bt8xx')
| -rw-r--r-- | drivers/media/pci/bt8xx/bttv-input.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-input.c b/drivers/media/pci/bt8xx/bttv-input.c index da49c5567db5..08266b23826e 100644 --- a/drivers/media/pci/bt8xx/bttv-input.c +++ b/drivers/media/pci/bt8xx/bttv-input.c @@ -332,11 +332,15 @@ static void bttv_ir_stop(struct bttv *btv) static int get_key_pv951(struct IR_i2c *ir, enum rc_proto *protocol, u32 *scancode, u8 *toggle) { + int rc; unsigned char b; /* poll IR chip */ - if (1 != i2c_master_recv(ir->c, &b, 1)) { + rc = i2c_master_recv(ir->c, &b, 1); + if (rc != 1) { dprintk("read error\n"); + if (rc < 0) + return rc; return -EIO; } |