Merge tag 'v4.9.214' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...

[platform/kernel/linux-amlogic.git] / drivers / media / usb / uvc / uvc_driver.c

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 9803135..94acf7c 100644 (file)
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2206,7 +2206,7 @@ static int uvc_reset_resume(struct usb_interface *intf)
  * Module parameters
  */
 
-static int uvc_clock_param_get(char *buffer, struct kernel_param *kp)
+static int uvc_clock_param_get(char *buffer, const struct kernel_param *kp)
 {
        if (uvc_clock_param == CLOCK_MONOTONIC)
                return sprintf(buffer, "CLOCK_MONOTONIC");
@@ -2214,7 +2214,7 @@ static int uvc_clock_param_get(char *buffer, struct kernel_param *kp)
                return sprintf(buffer, "CLOCK_REALTIME");
 }
 
-static int uvc_clock_param_set(const char *val, struct kernel_param *kp)
+static int uvc_clock_param_set(const char *val, const struct kernel_param *kp)
 {
        if (strncasecmp(val, "clock_", strlen("clock_")) == 0)
                val += strlen("clock_");