Commit ed356f11 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

media: vivid: check if the cec_adapter is valid

If CEC is not enabled for the vivid driver, then the adap pointer is NULL
and 'adap->phys_addr' will fail.

Cc: <stable@vger.kernel.org>      # for v4.12 and up
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 290ef7d8
...@@ -862,7 +862,8 @@ int vidioc_g_edid(struct file *file, void *_fh, ...@@ -862,7 +862,8 @@ int vidioc_g_edid(struct file *file, void *_fh,
return -EINVAL; return -EINVAL;
if (edid->start_block + edid->blocks > dev->edid_blocks) if (edid->start_block + edid->blocks > dev->edid_blocks)
edid->blocks = dev->edid_blocks - edid->start_block; edid->blocks = dev->edid_blocks - edid->start_block;
cec_set_edid_phys_addr(dev->edid, dev->edid_blocks * 128, adap->phys_addr); if (adap)
cec_set_edid_phys_addr(dev->edid, dev->edid_blocks * 128, adap->phys_addr);
memcpy(edid->edid, dev->edid + edid->start_block * 128, edid->blocks * 128); memcpy(edid->edid, dev->edid + edid->start_block * 128, edid->blocks * 128);
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment