common: USB_VcomDeinit() always shuts down the singleton CDC device.

This removes the function's argument.

diff --git a/src/common/virtual_com.c b/src/common/virtual_com.c
index aa25cd78590424c7d567414888c855fd3aa9d2c4..9b40b50d721c18d18b1880ca8b0706ffdf12acf7 100644 (file)
--- a/src/common/virtual_com.c
+++ b/src/common/virtual_com.c
@@ -660,10 +660,14 @@ USB_VcomInit (uint16_t vid, uint16_t pid)
 }
 
 /* See virtual_com.h for documentation of this function. */
-void USB_VcomDeinit(usb_device_handle deviceHandle)
+void
+USB_VcomDeinit (void)
 {
-    USB_DeviceStop(deviceHandle);
-    USB_DeviceDeinit(deviceHandle);
+       if (s_cdcVcom.deviceHandle == NULL)
+               return;
+
+    USB_DeviceStop (s_cdcVcom.deviceHandle);
+    USB_DeviceDeinit (s_cdcVcom.deviceHandle);
     s_cdcVcom.deviceHandle = NULL;
 
        /* XXX: We are not stopping the USBOTG clock yet. */

diff --git a/src/common/virtual_com.h b/src/common/virtual_com.h
index c8e5f020391bb1eb192606c014e9e65dcd1a3739..84acdfa4b31d55a0edc24a6e21abda5889218289 100644 (file)
--- a/src/common/virtual_com.h
+++ b/src/common/virtual_com.h
@@ -134,6 +134,6 @@ usb_device_handle USB_VcomInit (uint16_t vid, uint16_t pid);
  *
  * @return pointer to USB device handle.
  */
-void USB_VcomDeinit(usb_device_handle deviceHandle);
+void USB_VcomDeinit (void);
 
 #endif /* _USB_CDC_VCOM_H_ */