Commit fd013265 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "media: usb: gspca: add a missed check for goto_low_power" 

This reverts commit 5b711870.

Because of recent interactions with developers from @umn.edu, all
commits from them have been recently re-reviewed to ensure if they were
correct or not.

Upon review, this commit was found to do does nothing useful as a user
can do nothing with this information and if an error did happen, the
code would continue on as before.  Because of this, just revert it.

Cc: Kangjie Lu <kjlu@umn.edu>
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Link: https://lore.kernel.org/r/20210503115736.2104747-7-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 754f3915

drivers/media/usb/gspca/cpia1.c

+1 −5
Original line number Diff line number Diff line
@@ -1424,7 +1424,6 @@ static int sd_config(struct gspca_dev *gspca_dev, 
{

	struct sd *sd = (struct sd *) gspca_dev;

	struct cam *cam;

	int ret;



	sd->mainsFreq = FREQ_DEF == V4L2_CID_POWER_LINE_FREQUENCY_60HZ;

	reset_camera_params(gspca_dev);
@@ -1436,10 +1435,7 @@ static int sd_config(struct gspca_dev *gspca_dev, 
	cam->cam_mode = mode;

	cam->nmodes = ARRAY_SIZE(mode);



	ret = goto_low_power(gspca_dev);

	if (ret)

		gspca_err(gspca_dev, "Cannot go to low power mode: %d\n",

			  ret);

	goto_low_power(gspca_dev);

	/* Check the firmware version. */

	sd->params.version.firmwareVersion = 0;

	get_version_information(gspca_dev);