diff options
| author | Michael Hsu <mhsu@nvidia.com> | 2011-12-08 18:14:01 -0800 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-21 12:06:22 +0530 |
| commit | 4773328fcd4a7287e40c53ba2ffd507ac1c66c78 (patch) | |
| tree | a99232f5c9600a5be3c7c65b81d5b7aed8e2e1b2 | |
| parent | c753b0b8ac4f344b938b9cb1de539e095371123b (diff) | |
usb: class: cdc-acm: Fix NO_UNION_NORMAL detection in CDC-ACM.
Use AND operator instead of equality operator to test for
NO_UNION_NORMAL quirk. This allows devices with multiple
quirks to be properly tested against the NO_UNION_NORMAL
feature.
Change-Id: I4c6b019f161ddd91f40ad8e533cab2b435a68ddb
Signed-off-by: Michael Hsu <mhsu@nvidia.com>
Reviewed-on: http://git-master/r/69892
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 65e269f5fa16..991089eee117 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -870,7 +870,7 @@ static int acm_probe(struct usb_interface *intf, return -ENODEV; /* handle quirks deadly to normal probing*/ - if (quirks == NO_UNION_NORMAL) { + if (quirks & NO_UNION_NORMAL) { data_interface = usb_ifnum_to_if(usb_dev, 1); control_interface = usb_ifnum_to_if(usb_dev, 0); goto skip_normal_probe; |