diff options
| author | Erik Gilling <konkers@android.com> | 2011-10-25 11:40:56 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-10-25 11:40:56 +0800 |
| commit | 6fb4abc6aad722767e13f2b97418bf0c2b17fd74 (patch) | |
| tree | 5142640dcce32c9f5b63d7af3c73085277e7cf0d /drivers | |
| parent | 435a137bf777b2f6b4d51ba12aa98891e05999ee (diff) | |
usb: otg: add proxy_wait handler to otg_id
Some otg_id handlers can detect what's connected but can't detect a change.
This allows that handler to pass off the waiting for ID change to a proxy.
Change-Id: Ib38b750c3da4bffc35e37b620ecee37c5d64d31f
Signed-off-by: Erik Gilling <konkers@android.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/otg/otg_id.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/usb/otg/otg_id.c b/drivers/usb/otg/otg_id.c index 2398b1a951d..ce22b462130 100644 --- a/drivers/usb/otg/otg_id.c +++ b/drivers/usb/otg/otg_id.c @@ -44,16 +44,24 @@ static void __otg_id_notify(void) { int ret; struct otg_id_notifier_block *otg_id_nb; - + bool proxy_wait = false; if (plist_head_empty(&otg_id_plist)) return; plist_for_each_entry(otg_id_nb, &otg_id_plist, p) { - ret = otg_id_nb->detect(otg_id_nb); + if (proxy_wait) { + if (otg_id_nb->proxy_wait) + ret = otg_id_nb->proxy_wait(otg_id_nb); + } else { + ret = otg_id_nb->detect(otg_id_nb); + } if (ret == OTG_ID_HANDLED) { otg_id_active = otg_id_nb; return; } + if (ret == OTG_ID_PROXY_WAIT) + proxy_wait = true; + } WARN(1, "otg id event not handled"); |