Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 112236
b: refs/heads/master
c: 1d74a6b
h: refs/heads/master
v: v3
  • Loading branch information
Steve Glendinning authored and David S. Miller committed Oct 9, 2008
1 parent 4cef665 commit 6fe3740
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: a1080a8b0bc301c223c4bf0cea4c5e42f43dcf58
refs/heads/master: 1d74a6bddf647285e7aa4e9ca4ec16eb071dfd95
10 changes: 5 additions & 5 deletions trunk/drivers/net/usb/smsc95xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,12 @@ static void smsc95xx_async_cmd_callback(struct urb *urb, struct pt_regs *regs)
usb_free_urb(urb);
}

static int smsc95xx_write_reg_async(struct usbnet *dev, u32 index, u32 *data)
static int smsc95xx_write_reg_async(struct usbnet *dev, u16 index, u32 *data)
{
struct usb_context *usb_context;
int status;
struct urb *urb;
const u32 size = 4;
const u16 size = 4;

urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb) {
Expand All @@ -344,8 +344,8 @@ static int smsc95xx_write_reg_async(struct usbnet *dev, u32 index, u32 *data)
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
usb_context->req.bRequest = USB_VENDOR_REQUEST_WRITE_REGISTER;
usb_context->req.wValue = 00;
usb_context->req.wIndex = cpu_to_le32(index);
usb_context->req.wLength = cpu_to_le32(size);
usb_context->req.wIndex = cpu_to_le16(index);
usb_context->req.wLength = cpu_to_le16(size);
init_completion(&usb_context->notify);

usb_fill_control_urb(urb, dev->udev, usb_sndctrlpipe(dev->udev, 0),
Expand Down Expand Up @@ -545,7 +545,7 @@ static void smsc95xx_status(struct usbnet *dev, struct urb *urb)
}

memcpy(&intdata, urb->transfer_buffer, 4);
le32_to_cpus(intdata);
le32_to_cpus(&intdata);

if (netif_msg_link(dev))
devdbg(dev, "intdata: 0x%08X", intdata);
Expand Down

0 comments on commit 6fe3740

Please sign in to comment.