Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250309
b: refs/heads/master
c: 51ea629
h: refs/heads/master
i:
  250307: 480f5c6
v: v3
  • Loading branch information
Jarod Wilson authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent b3444ae commit 99db140
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 35e5ed7fe2326b7ea559ae91a4ee54cc0d8305d0
refs/heads/master: 51ea62927e5bbb577360dd92c3f282edbf4cd3f8
18 changes: 9 additions & 9 deletions trunk/drivers/media/rc/mceusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -615,11 +615,10 @@ static void mce_async_callback(struct urb *urb, struct pt_regs *regs)
}

/* request incoming or send outgoing usb packet - used to initialize remote */
static void mce_request_packet(struct mceusb_dev *ir,
struct usb_endpoint_descriptor *ep,
unsigned char *data, int size, int urb_type)
static void mce_request_packet(struct mceusb_dev *ir, unsigned char *data,
int size, int urb_type)
{
int res;
int res, pipe;
struct urb *async_urb;
struct device *dev = ir->dev;
unsigned char *async_buf;
Expand All @@ -639,10 +638,11 @@ static void mce_request_packet(struct mceusb_dev *ir,
}

/* outbound data */
usb_fill_int_urb(async_urb, ir->usbdev,
usb_sndintpipe(ir->usbdev, ep->bEndpointAddress),
pipe = usb_sndintpipe(ir->usbdev,
ir->usb_ep_out->bEndpointAddress);
usb_fill_int_urb(async_urb, ir->usbdev, pipe,
async_buf, size, (usb_complete_t)mce_async_callback,
ir, ep->bInterval);
ir, ir->usb_ep_out->bInterval);
memcpy(async_buf, data, size);

} else if (urb_type == MCEUSB_RX) {
Expand Down Expand Up @@ -670,12 +670,12 @@ static void mce_request_packet(struct mceusb_dev *ir,

static void mce_async_out(struct mceusb_dev *ir, unsigned char *data, int size)
{
mce_request_packet(ir, ir->usb_ep_out, data, size, MCEUSB_TX);
mce_request_packet(ir, data, size, MCEUSB_TX);
}

static void mce_sync_in(struct mceusb_dev *ir, unsigned char *data, int size)
{
mce_request_packet(ir, ir->usb_ep_in, data, size, MCEUSB_RX);
mce_request_packet(ir, data, size, MCEUSB_RX);
}

/* Send data out the IR blaster port(s) */
Expand Down

0 comments on commit 99db140

Please sign in to comment.