1 files changed, 12 insertions, 3 deletions

diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index 838b56f097cf..7eaf99b22a48 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -637,14 +637,13 @@ static int uvc_parse_streaming(struct uvc_device *dev,
         }
         streaming->header.bControlSize = n;
 
-        streaming->header.bmaControls = kmalloc(p*n, GFP_KERNEL);
+        streaming->header.bmaControls = kmemdup(&buffer[size], p * n,
+                                                GFP_KERNEL);
         if (streaming->header.bmaControls == NULL) {
                 ret = -ENOMEM;
                 goto error;
         }
 
-        memcpy(streaming->header.bmaControls, &buffer[size], p*n);
-
         buflen -= buffer[0];
         buffer += buffer[0];
 
@@ -2174,6 +2173,15 @@ static struct usb_device_id uvc_ids[] = {
           .bInterfaceSubClass   = 1,
           .bInterfaceProtocol   = 0,
           .driver_info          = UVC_QUIRK_PROBE_EXTRAFIELDS },
+        /* Manta MM-353 Plako */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x18ec,
+          .idProduct            = 0x3188,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_MINMAX },
         /* FSC WebCam V30S */
         { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                 | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -2261,6 +2269,7 @@ static int __init uvc_init(void)
 static void __exit uvc_cleanup(void)
 {
         usb_deregister(&uvc_driver.driver);
+        uvc_ctrl_cleanup();
 }
 
 module_init(uvc_init);