diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-12-10 16:30:15 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:09 -0800 |
| commit | 9cda6a28208019f2c9c7d902dcba7c0d33310b5a (patch) | |
| tree | c8138c2391a2339114434f137cefba344a852f12 /include/linux/usb/composite.h | |
| parent | b646355bb840e5118a2751e69ef6ff17816a576d (diff) | |
USB: gadget: composite: Use separate switches for connected and config state
Also remove disconnect debouncing, which didn't actually work on some platforms
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'include/linux/usb/composite.h')
| -rw-r--r-- | include/linux/usb/composite.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 32a84bcecd3d..86004e313bd1 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -377,9 +377,13 @@ struct usb_composite_dev { /* protects deactivations and delayed_status counts*/ spinlock_t lock; - struct switch_dev sdev; - /* used by usb_composite_force_reset to avoid signalling switch changes */ - bool mute_switch; + /* switch indicating connected/disconnected state */ + struct switch_dev sw_connected; + /* switch indicating current configuration */ + struct switch_dev sw_config; + /* current connected state for sw_connected */ + bool connected; + struct work_struct switch_work; }; |