]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
media: cec-adap: return from cec_s_conn_info() if adap is invalid
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Fri, 23 Aug 2019 11:07:21 +0000 (08:07 -0300)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 26 Aug 2019 09:30:14 +0000 (06:30 -0300)
Check if cec_s_conn_info is called with a valid cec adapter,
do nothing if it is invalid.

This makes it possible to call this function even if CEC support is
disabled in the kernel config.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/cec/cec-adap.c

index 451c61bde4d42f1b97c62f05f5dd88bc9f6ad3f1..5ef7daeb8cbd70827e09f8a36fe149f2531a4caa 100644 (file)
@@ -1614,6 +1614,9 @@ EXPORT_SYMBOL_GPL(cec_s_phys_addr_from_edid);
 void cec_s_conn_info(struct cec_adapter *adap,
                     const struct cec_connector_info *conn_info)
 {
+       if (IS_ERR_OR_NULL(adap))
+               return;
+
        if (!(adap->capabilities & CEC_CAP_CONNECTOR_INFO))
                return;