diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
| commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
| tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /drivers/media/video/sh_mobile_ceu_camera.c | |
| parent | 30ba3ead05763b172acaa65ae1be71af2a878940 (diff) | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
Merge commit 'v2.6.34' into next
Diffstat (limited to 'drivers/media/video/sh_mobile_ceu_camera.c')
| -rw-r--r-- | drivers/media/video/sh_mobile_ceu_camera.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 6e16b3979326..1ad980f8e770 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/video/sh_mobile_ceu_camera.c | |||
| @@ -1633,7 +1633,7 @@ static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd, | |||
| 1633 | height = pix->height; | 1633 | height = pix->height; |
| 1634 | 1634 | ||
| 1635 | pix->bytesperline = soc_mbus_bytes_per_line(width, xlate->host_fmt); | 1635 | pix->bytesperline = soc_mbus_bytes_per_line(width, xlate->host_fmt); |
| 1636 | if (pix->bytesperline < 0) | 1636 | if ((int)pix->bytesperline < 0) |
| 1637 | return pix->bytesperline; | 1637 | return pix->bytesperline; |
| 1638 | pix->sizeimage = height * pix->bytesperline; | 1638 | pix->sizeimage = height * pix->bytesperline; |
| 1639 | 1639 | ||