Merge remote-tracking branch 'mkp-scsi/fixes' into fixes

[mirror_ubuntu-artful-kernel.git] / drivers / media / usb / gspca / sq905c.c

diff --git a/drivers/media/usb/gspca/sq905c.c b/drivers/media/usb/gspca/sq905c.c
index aa21edc9502d67466f7ed13959d85709b9e36889..6c45dcc44eb01fd37fe21a178d20301dfc0e673e 100644 (file)
--- a/drivers/media/usb/gspca/sq905c.c
+++ b/drivers/media/usb/gspca/sq905c.c
@@ -210,8 +210,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
        int ret;
 
        PDEBUG(D_PROBE,
-               "SQ9050 camera detected"
-               " (vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
+              "SQ9050 camera detected (vid/pid 0x%04X:0x%04X)",
+              id->idVendor, id->idProduct);
 
        ret = sq905c_command(gspca_dev, SQ905C_GET_ID, 0);
        if (ret < 0) {
@@ -257,11 +257,8 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
 /* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
-       int ret;
-
        /* connect to the camera and reset it. */
-       ret = sq905c_command(gspca_dev, SQ905C_CLEAR, 0);
-       return ret;
+       return sq905c_command(gspca_dev, SQ905C_CLEAR, 0);
 }
 
 /* Set up for getting frames. */