diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-08-27 16:22:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-08-27 16:22:20 +1000 |
| commit | 93bb70e0c00f1be4cc857e4d8375c44058cce71e (patch) | |
| tree | 7b6a11844e00b3f4bf8281c7a799e61494220819 /drivers/media/video/soc_mediabus.c | |
| parent | 6f314ebbaa2667d67a7206ba78f28e46cf47eda5 (diff) | |
| parent | c182ae42cc3611f7b3fa803c0bcab6e5d29bea63 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
Diffstat (limited to 'drivers/media/video/soc_mediabus.c')
| -rw-r--r-- | drivers/media/video/soc_mediabus.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/soc_mediabus.c b/drivers/media/video/soc_mediabus.c index 89dce097a827..a397812635d6 100644 --- a/drivers/media/video/soc_mediabus.c +++ b/drivers/media/video/soc_mediabus.c @@ -378,6 +378,9 @@ EXPORT_SYMBOL(soc_mbus_samples_per_pixel); s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf) { + if (mf->fourcc == V4L2_PIX_FMT_JPEG) + return 0; + if (mf->layout != SOC_MBUS_LAYOUT_PACKED) return width * mf->bits_per_sample / 8; @@ -400,6 +403,9 @@ EXPORT_SYMBOL(soc_mbus_bytes_per_line); s32 soc_mbus_image_size(const struct soc_mbus_pixelfmt *mf, u32 bytes_per_line, u32 height) { + if (mf->fourcc == V4L2_PIX_FMT_JPEG) + return 0; + if (mf->layout == SOC_MBUS_LAYOUT_PACKED) return bytes_per_line * height; |