projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
32ec457
)
V4L/DVB: media/az6027: handle -EIO failure
author
Dan Carpenter
<
[email protected]
>
Tue, 4 May 2010 12:31:13 +0000
(09:31 -0300)
committer
Mauro Carvalho Chehab
<
[email protected]
>
Wed, 19 May 2010 15:59:05 +0000
(12:59 -0300)
If the az6027_usb_in_op() returns a negative errno ret is -EIO and in
that case the value of b[0] may be undefined. The original code
assigned 0 to ret, but since it's already 0 now we can skip that.
Signed-off-by: Dan Carpenter <
[email protected]
>
Signed-off-by: Mauro Carvalho Chehab <
[email protected]
>
drivers/media/dvb/dvb-usb/az6027.c
patch
|
blob
|
history
diff --git
a/drivers/media/dvb/dvb-usb/az6027.c
b/drivers/media/dvb/dvb-usb/az6027.c
index baaa301c5768d562f5f99ebf81042beb9300e688..6681ac1c56e35763983167409490b315e8da9ad0 100644
(file)
--- a/
drivers/media/dvb/dvb-usb/az6027.c
+++ b/
drivers/media/dvb/dvb-usb/az6027.c
@@
-701,10
+701,7
@@
static int az6027_ci_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int o
} else
ret = 0;
- if (b[0] == 0) {
- ret = 0;
-
- } else if (b[0] == 1) {
+ if (!ret && b[0] == 1) {
ret = DVB_CA_EN50221_POLL_CAM_PRESENT |
DVB_CA_EN50221_POLL_CAM_READY;
}