summaryrefslogtreecommitdiff
path: root/drivers/media/usb/gspca/autogain_functions.c
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2019-04-10 22:50:49 +0300
committerSean Paul <seanpaul@chromium.org>2019-04-10 22:50:49 +0300
commit3bfaf1f7044c6a3b1e00fcad2d0529f0da449d67 (patch)
tree490bc7e8aa29c2ee41eb4813683f1aa23971abd3 /drivers/media/usb/gspca/autogain_functions.c
parent669105a74a287b14cdec04c64eb51db1bb890f64 (diff)
parent14d2bd53a47a7e1cb3e03d00a6b952734cf90f3f (diff)
downloadlinux-3bfaf1f7044c6a3b1e00fcad2d0529f0da449d67.tar.xz
Merge drm/drm-next into drm-misc-next
Finally have a reason for a backmerge other than "it's been a while"! Backmerging drm-next to -misc-next to facilitate Rob Herring's work on Panfrost. Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/media/usb/gspca/autogain_functions.c')
-rw-r--r--drivers/media/usb/gspca/autogain_functions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/gspca/autogain_functions.c b/drivers/media/usb/gspca/autogain_functions.c
index 6dfab2b077f7..f915cc7c0c63 100644
--- a/drivers/media/usb/gspca/autogain_functions.c
+++ b/drivers/media/usb/gspca/autogain_functions.c
@@ -98,7 +98,7 @@ EXPORT_SYMBOL(gspca_expo_autogain);
80 %) and if that does not help, only then changes exposure. This leads
to a much more stable image then using the knee algorithm which at
certain points of the knee graph will only try to adjust exposure,
- which leads to oscilating as one exposure step is huge.
+ which leads to oscillating as one exposure step is huge.
Returns 0 if no changes were made, 1 if the gain and or exposure settings
where changed. */