From: Kangjie Lu Date: Tue, 25 Dec 2018 06:31:21 +0000 (-0500) Subject: media: usb: gspca: add a missed return-value check for do_command X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5ceaf5452c1b2a452dadaf377f9f07af7bda9cc3;p=linux.git media: usb: gspca: add a missed return-value check for do_command do_command() may fail. The fix adds the missed return value of do_command(). If it fails, returns its error code. Signed-off-by: Kangjie Lu Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/gspca/cpia1.c b/drivers/media/usb/gspca/cpia1.c index 2b09af8865f40..23fbda56fc919 100644 --- a/drivers/media/usb/gspca/cpia1.c +++ b/drivers/media/usb/gspca/cpia1.c @@ -547,10 +547,14 @@ static int do_command(struct gspca_dev *gspca_dev, u16 command, } if (sd->params.qx3.button) { /* button pressed - unlock the latch */ - do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, + ret = do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, 3, 0xdf, 0xdf, 0); - do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, + if (ret) + return ret; + ret = do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, 3, 0xff, 0xff, 0); + if (ret) + return ret; } /* test whether microscope is cradled */