diff options
author | Daniel Mack <daniel@caiaq.de> | 2010-07-01 00:08:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 14:01:15 -0400 |
commit | 8871c85d86829a2739ec797c4343ebd3664895b9 (patch) | |
tree | 8c9d492d0cdee152afc27d0f5e2f30bcd756386e /drivers/media | |
parent | 4c61f678a468768afd45c3d9ac697f8f55aa04eb (diff) |
V4L/DVB: drivers/media/dvb/dvb-usb/dib0700: fix return values
Propagte correct error values instead of returning -1 which just means
-EPERM ("Permission denied")
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dib0700_core.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c index 4f961d2d1817..d2dabac9b63a 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_core.c +++ b/drivers/media/dvb/dvb-usb/dib0700_core.c | |||
@@ -640,10 +640,10 @@ int dib0700_rc_setup(struct dvb_usb_device *d) | |||
640 | return 0; | 640 | return 0; |
641 | 641 | ||
642 | /* Set the IR mode */ | 642 | /* Set the IR mode */ |
643 | i = dib0700_ctrl_wr(d, rc_setup, 3); | 643 | i = dib0700_ctrl_wr(d, rc_setup, sizeof(rc_setup)); |
644 | if (i<0) { | 644 | if (i < 0) { |
645 | err("ir protocol setup failed"); | 645 | err("ir protocol setup failed"); |
646 | return -1; | 646 | return i; |
647 | } | 647 | } |
648 | 648 | ||
649 | if (st->fw_version < 0x10200) | 649 | if (st->fw_version < 0x10200) |
@@ -653,14 +653,14 @@ int dib0700_rc_setup(struct dvb_usb_device *d) | |||
653 | purb = usb_alloc_urb(0, GFP_KERNEL); | 653 | purb = usb_alloc_urb(0, GFP_KERNEL); |
654 | if (purb == NULL) { | 654 | if (purb == NULL) { |
655 | err("rc usb alloc urb failed\n"); | 655 | err("rc usb alloc urb failed\n"); |
656 | return -1; | 656 | return -ENOMEM; |
657 | } | 657 | } |
658 | 658 | ||
659 | purb->transfer_buffer = kzalloc(RC_MSG_SIZE_V1_20, GFP_KERNEL); | 659 | purb->transfer_buffer = kzalloc(RC_MSG_SIZE_V1_20, GFP_KERNEL); |
660 | if (purb->transfer_buffer == NULL) { | 660 | if (purb->transfer_buffer == NULL) { |
661 | err("rc kzalloc failed\n"); | 661 | err("rc kzalloc failed\n"); |
662 | usb_free_urb(purb); | 662 | usb_free_urb(purb); |
663 | return -1; | 663 | return -ENOMEM; |
664 | } | 664 | } |
665 | 665 | ||
666 | purb->status = -EINPROGRESS; | 666 | purb->status = -EINPROGRESS; |
@@ -669,12 +669,10 @@ int dib0700_rc_setup(struct dvb_usb_device *d) | |||
669 | dib0700_rc_urb_completion, d); | 669 | dib0700_rc_urb_completion, d); |
670 | 670 | ||
671 | ret = usb_submit_urb(purb, GFP_ATOMIC); | 671 | ret = usb_submit_urb(purb, GFP_ATOMIC); |
672 | if (ret != 0) { | 672 | if (ret) |
673 | err("rc submit urb failed\n"); | 673 | err("rc submit urb failed\n"); |
674 | return -1; | ||
675 | } | ||
676 | 674 | ||
677 | return 0; | 675 | return ret; |
678 | } | 676 | } |
679 | 677 | ||
680 | static int dib0700_probe(struct usb_interface *intf, | 678 | static int dib0700_probe(struct usb_interface *intf, |