diff options
author | Fabian Frederick <fabf@skynet.be> | 2015-05-18 13:59:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-24 12:30:07 -0400 |
commit | 2cfef79ddce42e9604293424381b2e59913f600c (patch) | |
tree | 0ec3573282be2049cb23e2bc6e9eb61055d23356 /drivers/usb/class | |
parent | 65c35dd59002798cc87212d23ff3c87fd3a5d721 (diff) |
cdc-acm: use swap() in acm_probe()
Use kernel.h macro definition.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 877b637e7f7b..eb22a0608033 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -1263,12 +1263,9 @@ skip_normal_probe: | |||
1263 | != CDC_DATA_INTERFACE_TYPE) { | 1263 | != CDC_DATA_INTERFACE_TYPE) { |
1264 | if (control_interface->cur_altsetting->desc.bInterfaceClass | 1264 | if (control_interface->cur_altsetting->desc.bInterfaceClass |
1265 | == CDC_DATA_INTERFACE_TYPE) { | 1265 | == CDC_DATA_INTERFACE_TYPE) { |
1266 | struct usb_interface *t; | ||
1267 | dev_dbg(&intf->dev, | 1266 | dev_dbg(&intf->dev, |
1268 | "Your device has switched interfaces.\n"); | 1267 | "Your device has switched interfaces.\n"); |
1269 | t = control_interface; | 1268 | swap(control_interface, data_interface); |
1270 | control_interface = data_interface; | ||
1271 | data_interface = t; | ||
1272 | } else { | 1269 | } else { |
1273 | return -EINVAL; | 1270 | return -EINVAL; |
1274 | } | 1271 | } |
@@ -1297,12 +1294,9 @@ skip_normal_probe: | |||
1297 | /* workaround for switched endpoints */ | 1294 | /* workaround for switched endpoints */ |
1298 | if (!usb_endpoint_dir_in(epread)) { | 1295 | if (!usb_endpoint_dir_in(epread)) { |
1299 | /* descriptors are swapped */ | 1296 | /* descriptors are swapped */ |
1300 | struct usb_endpoint_descriptor *t; | ||
1301 | dev_dbg(&intf->dev, | 1297 | dev_dbg(&intf->dev, |
1302 | "The data interface has switched endpoints\n"); | 1298 | "The data interface has switched endpoints\n"); |
1303 | t = epread; | 1299 | swap(epread, epwrite); |
1304 | epread = epwrite; | ||
1305 | epwrite = t; | ||
1306 | } | 1300 | } |
1307 | made_compressed_probe: | 1301 | made_compressed_probe: |
1308 | dev_dbg(&intf->dev, "interfaces are valid\n"); | 1302 | dev_dbg(&intf->dev, "interfaces are valid\n"); |