Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248833
b: refs/heads/master
c: d860852
h: refs/heads/master
i:
  248831: 9b1fade
v: v3
  • Loading branch information
Pavankumar Kondeti authored and Greg Kroah-Hartman committed May 7, 2011
1 parent ad0530b commit 75dde70
Show file tree
Hide file tree
Showing 4 changed files with 458 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: 0f73cac8e41723d600c91a0f5b481dc3202f4f82
refs/heads/master: d860852e087eed7eadbea64f1a8db9a231c5e9b3
10 changes: 10 additions & 0 deletions trunk/drivers/usb/gadget/ci13xxx_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2506,6 +2506,15 @@ static int ci13xxx_wakeup(struct usb_gadget *_gadget)
return ret;
}

static int ci13xxx_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
{
struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget);

if (udc->transceiver)
return otg_set_power(udc->transceiver, mA);
return -ENOTSUPP;
}

/**
* Device operations part of the API to the USB controller hardware,
* which don't involve endpoints (or i/o)
Expand All @@ -2514,6 +2523,7 @@ static int ci13xxx_wakeup(struct usb_gadget *_gadget)
static const struct usb_gadget_ops usb_gadget_ops = {
.vbus_session = ci13xxx_vbus_session,
.wakeup = ci13xxx_wakeup,
.vbus_draw = ci13xxx_vbus_draw,
};

/**
Expand Down
Loading

0 comments on commit 75dde70

Please sign in to comment.