]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: usb: gspca: add a missed return-value check for do_command
authorKangjie Lu <kjlu@umn.edu>
Tue, 25 Dec 2018 06:31:21 +0000 (01:31 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 16 Jan 2019 16:24:35 +0000 (11:24 -0500)
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 <kjlu@umn.edu>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/usb/gspca/cpia1.c

index 2b09af8865f40f5fc91cc943205e42cf921f9462..23fbda56fc919a1b6b2bbd8fe7f0ee0b1a6ac191 100644 (file)
@@ -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 */