diff options
| author | Antti Palosaari | 2013-03-08 21:39:12 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-03-21 23:06:13 +0100 |
| commit | 1bfd5294ddb8b3d3ac05f609334070454b5ef96f (patch) | |
| tree | 0cbe45e46f53ed93150f8f78661d0ab841b9257e | |
| parent | [media] af9033: implement i/o optimized reg table writer (diff) | |
| download | kernel-qcow2-linux-1bfd5294ddb8b3d3ac05f609334070454b5ef96f.tar.gz kernel-qcow2-linux-1bfd5294ddb8b3d3ac05f609334070454b5ef96f.tar.xz kernel-qcow2-linux-1bfd5294ddb8b3d3ac05f609334070454b5ef96f.zip | |
[media] af9035: check I/O errors on IR polling
Use more careful error checks.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/usb/dvb-usb-v2/af9035.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c index 735646d4f34a..5d6b3713e035 100644 --- a/drivers/media/usb/dvb-usb-v2/af9035.c +++ b/drivers/media/usb/dvb-usb-v2/af9035.c @@ -100,6 +100,10 @@ static int af9035_ctrl_msg(struct dvb_usb_device *d, struct usb_req *req) /* check status */ if (state->buf[2]) { + /* fw returns status 1 when IR code was not received */ + if (req->cmd == CMD_IR_GET || state->buf[2] == 1) + return 1; + dev_dbg(&d->udev->dev, "%s: command=%02x failed fw error=%d\n", __func__, req->cmd, state->buf[2]); ret = -EIO; @@ -1223,7 +1227,9 @@ static int af9035_rc_query(struct dvb_usb_device *d) struct usb_req req = { CMD_IR_GET, 0, 0, NULL, 4, b }; ret = af9035_ctrl_msg(d, &req); - if (ret < 0) + if (ret == 1) + return 0; + else if (ret < 0) goto err; if ((b[2] + b[3]) == 0xff) { @@ -1240,9 +1246,12 @@ static int af9035_rc_query(struct dvb_usb_device *d) rc_keydown(d->rc_dev, key, 0); -err: - /* ignore errors */ return 0; + +err: + dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret); + + return ret; } static int af9035_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc) |