OSDN Git Service

media: cx231xx: replace BUG_ON with recovery code
authorAditya Pakki <pakki001@umn.edu>
Sun, 15 Dec 2019 19:08:04 +0000 (20:08 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 8 Jan 2020 13:27:51 +0000 (14:27 +0100)
In cx231xx_i2c_register, if dev->cx231xx_send_usb_command is NULL,
the code crashes. However, the callers in cx231xx-core are able to
handle the error without crashing. This patch fixes this issue.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/usb/cx231xx/cx231xx-i2c.c

index f33b6a0..c665925 100644 (file)
@@ -515,7 +515,8 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus)
 {
        struct cx231xx *dev = bus->dev;
 
-       BUG_ON(!dev->cx231xx_send_usb_command);
+       if (!dev->cx231xx_send_usb_command)
+               return -EINVAL;
 
        bus->i2c_adap = cx231xx_adap_template;
        bus->i2c_adap.dev.parent = dev->dev;