| From 2a60ed490b24c0a20f99cf4d2691d5be23a3e412 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 3 May 2021 13:56:33 +0200 |
| Subject: Revert "media: usb: gspca: add a missed check for goto_low_power" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| [ Upstream commit fd013265e5b5576a74a033920d6c571e08d7c423 ] |
| |
| This reverts commit 5b711870bec4dc9a6d705d41e127e73944fa3650. |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/usb/gspca/cpia1.c | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| diff --git a/drivers/media/usb/gspca/cpia1.c b/drivers/media/usb/gspca/cpia1.c |
| index a4f7431486f3..d93d384286c1 100644 |
| --- a/drivers/media/usb/gspca/cpia1.c |
| +++ b/drivers/media/usb/gspca/cpia1.c |
| @@ -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); |
| -- |
| 2.30.2 |
| |