From 4773328fcd4a7287e40c53ba2ffd507ac1c66c78 Mon Sep 17 00:00:00 2001 From: Michael Hsu Date: Thu, 8 Dec 2011 18:14:01 -0800 Subject: 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 Reviewed-on: http://git-master/r/69892 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani Reviewed-by: Seshendra Gadagottu --- drivers/usb/class/cdc-acm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3