2 files changed, 5 insertions, 12 deletions

diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c
index c705f248da88..21d87124986b 100644
--- a/drivers/media/video/uvc/uvc_status.c
+++ b/drivers/media/video/uvc/uvc_status.c
@@ -24,26 +24,19 @@
 #ifdef CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV
 static int uvc_input_init(struct uvc_device *dev)
 {
-        struct usb_device *udev = dev->udev;
         struct input_dev *input;
-        char *phys = NULL;
         int ret;
 
         input = input_allocate_device();
         if (input == NULL)
                 return -ENOMEM;
 
-        phys = kmalloc(6 + strlen(udev->bus->bus_name) + strlen(udev->devpath),
-                        GFP_KERNEL);
-        if (phys == NULL) {
-                ret = -ENOMEM;
-                goto error;
-        }
-        sprintf(phys, "usb-%s-%s", udev->bus->bus_name, udev->devpath);
+        usb_make_path(dev->udev, dev->input_phys, sizeof(dev->input_phys));
+        strlcat(dev->input_phys, "/button", sizeof(dev->input_phys));
 
         input->name = dev->name;
-        input->phys = phys;
-        usb_to_input_id(udev, &input->id);
+        input->phys = dev->input_phys;
+        usb_to_input_id(dev->udev, &input->id);
         input->dev.parent = &dev->intf->dev;
 
         __set_bit(EV_KEY, input->evbit);
@@ -57,7 +50,6 @@ static int uvc_input_init(struct uvc_device *dev)
 
 error:
         input_free_device(input);
-        kfree(phys);
         return ret;
 }
 
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index b2639878f9b2..6f55c4d49cf4 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -647,6 +647,7 @@ struct uvc_device {
         struct urb *int_urb;
         __u8 *status;
         struct input_dev *input;
+        char input_phys[64];
 
         /* Video Streaming interfaces */
         struct list_head streaming;