From e7478ed9d547ca2b4dba4d5dbb9cc44bf7de4320 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Thu, 1 Jul 2010 01:08:58 -0300 Subject: [PATCH] --- yaml --- r: 202019 b: refs/heads/master c: 8871c85d86829a2739ec797c4343ebd3664895b9 h: refs/heads/master i: 202017: 6dc0fc9074326f6d535e90406e00deee3d6399c9 202015: e96450aa22253f6353a2c5bf502c3945f99311a0 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/dib0700_core.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 23ca48102d75..020795dc0e51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c61f678a468768afd45c3d9ac697f8f55aa04eb +refs/heads/master: 8871c85d86829a2739ec797c4343ebd3664895b9 diff --git a/trunk/drivers/media/dvb/dvb-usb/dib0700_core.c b/trunk/drivers/media/dvb/dvb-usb/dib0700_core.c index 4f961d2d1817..d2dabac9b63a 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dib0700_core.c +++ b/trunk/drivers/media/dvb/dvb-usb/dib0700_core.c @@ -640,10 +640,10 @@ int dib0700_rc_setup(struct dvb_usb_device *d) return 0; /* Set the IR mode */ - i = dib0700_ctrl_wr(d, rc_setup, 3); - if (i<0) { + i = dib0700_ctrl_wr(d, rc_setup, sizeof(rc_setup)); + if (i < 0) { err("ir protocol setup failed"); - return -1; + return i; } if (st->fw_version < 0x10200) @@ -653,14 +653,14 @@ int dib0700_rc_setup(struct dvb_usb_device *d) purb = usb_alloc_urb(0, GFP_KERNEL); if (purb == NULL) { err("rc usb alloc urb failed\n"); - return -1; + return -ENOMEM; } purb->transfer_buffer = kzalloc(RC_MSG_SIZE_V1_20, GFP_KERNEL); if (purb->transfer_buffer == NULL) { err("rc kzalloc failed\n"); usb_free_urb(purb); - return -1; + return -ENOMEM; } purb->status = -EINPROGRESS; @@ -669,12 +669,10 @@ int dib0700_rc_setup(struct dvb_usb_device *d) dib0700_rc_urb_completion, d); ret = usb_submit_urb(purb, GFP_ATOMIC); - if (ret != 0) { + if (ret) err("rc submit urb failed\n"); - return -1; - } - return 0; + return ret; } static int dib0700_probe(struct usb_interface *intf,