aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/omap/omap_voutlib.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
commit42933bac11e811f02200c944d8562a15f8ec4ff0 (patch)
treefcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/media/video/omap/omap_voutlib.c
parent2b9accbee563f535046ff2cd382d0acaa92e130c (diff)
parent25985edcedea6396277003854657b5f3cb31a628 (diff)
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings
Diffstat (limited to 'drivers/media/video/omap/omap_voutlib.c')
-rw-r--r--drivers/media/video/omap/omap_voutlib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/omap/omap_voutlib.c b/drivers/media/video/omap/omap_voutlib.c
index b941c761eef9..2aa6a76c5e59 100644
--- a/drivers/media/video/omap/omap_voutlib.c
+++ b/drivers/media/video/omap/omap_voutlib.c
@@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(omap_vout_default_crop);
53/* Given a new render window in new_win, adjust the window to the 53/* Given a new render window in new_win, adjust the window to the
54 * nearest supported configuration. The adjusted window parameters are 54 * nearest supported configuration. The adjusted window parameters are
55 * returned in new_win. 55 * returned in new_win.
56 * Returns zero if succesful, or -EINVAL if the requested window is 56 * Returns zero if successful, or -EINVAL if the requested window is
57 * impossible and cannot reasonably be adjusted. 57 * impossible and cannot reasonably be adjusted.
58 */ 58 */
59int omap_vout_try_window(struct v4l2_framebuffer *fbuf, 59int omap_vout_try_window(struct v4l2_framebuffer *fbuf,
@@ -101,7 +101,7 @@ EXPORT_SYMBOL_GPL(omap_vout_try_window);
101 * will also be adjusted if necessary. Preference is given to keeping the 101 * will also be adjusted if necessary. Preference is given to keeping the
102 * the window as close to the requested configuration as possible. If 102 * the window as close to the requested configuration as possible. If
103 * successful, new_win, vout->win, and crop are updated. 103 * successful, new_win, vout->win, and crop are updated.
104 * Returns zero if succesful, or -EINVAL if the requested preview window is 104 * Returns zero if successful, or -EINVAL if the requested preview window is
105 * impossible and cannot reasonably be adjusted. 105 * impossible and cannot reasonably be adjusted.
106 */ 106 */
107int omap_vout_new_window(struct v4l2_rect *crop, 107int omap_vout_new_window(struct v4l2_rect *crop,
@@ -155,7 +155,7 @@ EXPORT_SYMBOL_GPL(omap_vout_new_window);
155 * window would fall outside the display boundaries, the cropping rectangle 155 * window would fall outside the display boundaries, the cropping rectangle
156 * will also be adjusted to maintain the rescaling ratios. If successful, crop 156 * will also be adjusted to maintain the rescaling ratios. If successful, crop
157 * and win are updated. 157 * and win are updated.
158 * Returns zero if succesful, or -EINVAL if the requested cropping rectangle is 158 * Returns zero if successful, or -EINVAL if the requested cropping rectangle is
159 * impossible and cannot reasonably be adjusted. 159 * impossible and cannot reasonably be adjusted.
160 */ 160 */
161int omap_vout_new_crop(struct v4l2_pix_format *pix, 161int omap_vout_new_crop(struct v4l2_pix_format *pix,