Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 348380
b: refs/heads/master
c: 4c3de59
h: refs/heads/master
v: v3
  • Loading branch information
Jussi Kivilinna authored and John W. Linville committed Jan 2, 2013
1 parent d19af9b commit cf83973
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 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: 12e9432707dad5a09d8c51857b275c62bb6f91c8
refs/heads/master: 4c3de5920c486b8eefa6187ee6a181864c161100
7 changes: 3 additions & 4 deletions trunk/drivers/net/wireless/rtlwifi/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,17 +210,16 @@ static void _usb_writeN_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,
u16 index = REALTEK_USB_VENQT_CMD_IDX;
int pipe = usb_sndctrlpipe(udev, 0); /* write_out */
u8 *buffer;
dma_addr_t dma_addr;

wvalue = (u16)(addr&0x0000ffff);
buffer = usb_alloc_coherent(udev, (size_t)len, GFP_ATOMIC, &dma_addr);
wvalue = (u16)(addr & 0x0000ffff);
buffer = kmalloc(len, GFP_ATOMIC);
if (!buffer)
return;
memcpy(buffer, data, len);
usb_control_msg(udev, pipe, request, reqtype, wvalue,
index, buffer, len, 50);

usb_free_coherent(udev, (size_t)len, buffer, dma_addr);
kfree(buffer);
}

static void _rtl_usb_io_handler_init(struct device *dev,
Expand Down

0 comments on commit cf83973

Please sign in to comment.