diff options
Diffstat (limited to 'drivers/media/video/stk-webcam.c')
| -rw-r--r-- | drivers/media/video/stk-webcam.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index ceba45ad0294..9276ed997388 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
| @@ -1100,7 +1100,7 @@ static int stk_setup_format(struct stk_camera *dev) | |||
| 1100 | && i < ARRAY_SIZE(stk_sizes)) | 1100 | && i < ARRAY_SIZE(stk_sizes)) |
| 1101 | i++; | 1101 | i++; |
| 1102 | if (i == ARRAY_SIZE(stk_sizes)) { | 1102 | if (i == ARRAY_SIZE(stk_sizes)) { |
| 1103 | STK_ERROR("Something is broken in %s\n", __FUNCTION__); | 1103 | STK_ERROR("Something is broken in %s\n", __func__); |
| 1104 | return -EFAULT; | 1104 | return -EFAULT; |
| 1105 | } | 1105 | } |
| 1106 | /* This registers controls some timings, not sure of what. */ | 1106 | /* This registers controls some timings, not sure of what. */ |
| @@ -1465,7 +1465,7 @@ static void stk_camera_disconnect(struct usb_interface *interface) | |||
| 1465 | } | 1465 | } |
| 1466 | 1466 | ||
| 1467 | #ifdef CONFIG_PM | 1467 | #ifdef CONFIG_PM |
| 1468 | int stk_camera_suspend(struct usb_interface *intf, pm_message_t message) | 1468 | static int stk_camera_suspend(struct usb_interface *intf, pm_message_t message) |
| 1469 | { | 1469 | { |
| 1470 | struct stk_camera *dev = usb_get_intfdata(intf); | 1470 | struct stk_camera *dev = usb_get_intfdata(intf); |
| 1471 | if (is_streaming(dev)) { | 1471 | if (is_streaming(dev)) { |
| @@ -1476,7 +1476,7 @@ int stk_camera_suspend(struct usb_interface *intf, pm_message_t message) | |||
| 1476 | return 0; | 1476 | return 0; |
| 1477 | } | 1477 | } |
| 1478 | 1478 | ||
| 1479 | int stk_camera_resume(struct usb_interface *intf) | 1479 | static int stk_camera_resume(struct usb_interface *intf) |
| 1480 | { | 1480 | { |
| 1481 | struct stk_camera *dev = usb_get_intfdata(intf); | 1481 | struct stk_camera *dev = usb_get_intfdata(intf); |
| 1482 | if (!is_initialised(dev)) | 1482 | if (!is_initialised(dev)) |
