diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-21 11:59:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-21 12:00:01 -0400 |
| commit | 994bf1c92270e3d7731ea08f1d1bd7a668314e60 (patch) | |
| tree | 4409a21eab486e53fbe350a66e8a4f28b7a720c0 /drivers/media/video/m5mols/m5mols_capture.c | |
| parent | bd96efe17d945f0bad56d592f8686dc6309905e7 (diff) | |
| parent | cf6ace16a3cd8b728fb0afa68368fd40bbeae19f (diff) | |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest scheduler fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/m5mols/m5mols_capture.c')
| -rw-r--r-- | drivers/media/video/m5mols/m5mols_capture.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/video/m5mols/m5mols_capture.c b/drivers/media/video/m5mols/m5mols_capture.c index d71a3903b60f..d9471928369d 100644 --- a/drivers/media/video/m5mols/m5mols_capture.c +++ b/drivers/media/video/m5mols/m5mols_capture.c | |||
| @@ -2,10 +2,10 @@ | |||
| 2 | * The Capture code for Fujitsu M-5MOLS ISP | 2 | * The Capture code for Fujitsu M-5MOLS ISP |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2011 Samsung Electronics Co., Ltd. | 4 | * Copyright (C) 2011 Samsung Electronics Co., Ltd. |
| 5 | * Author: HeungJun Kim, riverful.kim@samsung.com | 5 | * Author: HeungJun Kim <riverful.kim@samsung.com> |
| 6 | * | 6 | * |
| 7 | * Copyright (C) 2009 Samsung Electronics Co., Ltd. | 7 | * Copyright (C) 2009 Samsung Electronics Co., Ltd. |
| 8 | * Author: Dongsoo Nathaniel Kim, dongsoo45.kim@samsung.com | 8 | * Author: Dongsoo Nathaniel Kim <dongsoo45.kim@samsung.com> |
| 9 | * | 9 | * |
| 10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | * it under the terms of the GNU General Public License as published by | 11 | * it under the terms of the GNU General Public License as published by |
| @@ -58,9 +58,9 @@ static int m5mols_read_rational(struct v4l2_subdev *sd, u32 addr_num, | |||
| 58 | { | 58 | { |
| 59 | u32 num, den; | 59 | u32 num, den; |
| 60 | 60 | ||
| 61 | int ret = m5mols_read(sd, addr_num, &num); | 61 | int ret = m5mols_read_u32(sd, addr_num, &num); |
| 62 | if (!ret) | 62 | if (!ret) |
| 63 | ret = m5mols_read(sd, addr_den, &den); | 63 | ret = m5mols_read_u32(sd, addr_den, &den); |
| 64 | if (ret) | 64 | if (ret) |
| 65 | return ret; | 65 | return ret; |
| 66 | *val = den == 0 ? 0 : num / den; | 66 | *val = den == 0 ? 0 : num / den; |
| @@ -99,20 +99,20 @@ static int m5mols_capture_info(struct m5mols_info *info) | |||
| 99 | if (ret) | 99 | if (ret) |
| 100 | return ret; | 100 | return ret; |
| 101 | 101 | ||
| 102 | ret = m5mols_read(sd, EXIF_INFO_ISO, (u32 *)&exif->iso_speed); | 102 | ret = m5mols_read_u16(sd, EXIF_INFO_ISO, &exif->iso_speed); |
| 103 | if (!ret) | 103 | if (!ret) |
| 104 | ret = m5mols_read(sd, EXIF_INFO_FLASH, (u32 *)&exif->flash); | 104 | ret = m5mols_read_u16(sd, EXIF_INFO_FLASH, &exif->flash); |
| 105 | if (!ret) | 105 | if (!ret) |
| 106 | ret = m5mols_read(sd, EXIF_INFO_SDR, (u32 *)&exif->sdr); | 106 | ret = m5mols_read_u16(sd, EXIF_INFO_SDR, &exif->sdr); |
| 107 | if (!ret) | 107 | if (!ret) |
| 108 | ret = m5mols_read(sd, EXIF_INFO_QVAL, (u32 *)&exif->qval); | 108 | ret = m5mols_read_u16(sd, EXIF_INFO_QVAL, &exif->qval); |
| 109 | if (ret) | 109 | if (ret) |
| 110 | return ret; | 110 | return ret; |
| 111 | 111 | ||
| 112 | if (!ret) | 112 | if (!ret) |
| 113 | ret = m5mols_read(sd, CAPC_IMAGE_SIZE, &info->cap.main); | 113 | ret = m5mols_read_u32(sd, CAPC_IMAGE_SIZE, &info->cap.main); |
| 114 | if (!ret) | 114 | if (!ret) |
| 115 | ret = m5mols_read(sd, CAPC_THUMB_SIZE, &info->cap.thumb); | 115 | ret = m5mols_read_u32(sd, CAPC_THUMB_SIZE, &info->cap.thumb); |
| 116 | if (!ret) | 116 | if (!ret) |
| 117 | info->cap.total = info->cap.main + info->cap.thumb; | 117 | info->cap.total = info->cap.main + info->cap.thumb; |
| 118 | 118 | ||
| @@ -122,7 +122,7 @@ static int m5mols_capture_info(struct m5mols_info *info) | |||
| 122 | int m5mols_start_capture(struct m5mols_info *info) | 122 | int m5mols_start_capture(struct m5mols_info *info) |
| 123 | { | 123 | { |
| 124 | struct v4l2_subdev *sd = &info->sd; | 124 | struct v4l2_subdev *sd = &info->sd; |
| 125 | u32 resolution = info->resolution; | 125 | u8 resolution = info->resolution; |
| 126 | int timeout; | 126 | int timeout; |
| 127 | int ret; | 127 | int ret; |
| 128 | 128 | ||