Commit 518b21ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:

 - drop the redundant pm_runtime_mark_last_busy() in rkvdec

 - fix probing error handling in rkvdec

 - fix an issue affecting lt6911uxe/lt6911uxc related to CSI-2 GPIO pins
   in int3472

* tag 'media/v6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: Remove redundant pm_runtime_mark_last_busy() calls
  platform/x86: int3472: add hpd pin support
  media: rkvdec: Remove redundant pm_runtime_mark_last_busy() calls
  media: rkvdec: Fix an error handling path in rkvdec_probe()
  media: rkvdec: Fix a NULL vs IS_ERR() bug in probe()
parents fab1beda 6f6fbd9a

drivers/media/i2c/alvium-csi2.c

+0 −1
Original line number Diff line number Diff line
@@ -1841,7 +1841,6 @@ static int alvium_s_stream(struct v4l2_subdev *sd, int enable) 


	} else {

		alvium_set_stream_mipi(alvium, enable);

		pm_runtime_mark_last_busy(&client->dev);

		pm_runtime_put_autosuspend(&client->dev);

	}

drivers/media/i2c/ccs/ccs-core.c

+1 −6
Original line number Diff line number Diff line
@@ -787,10 +787,8 @@ static int ccs_set_ctrl(struct v4l2_ctrl *ctrl) 
		rval = -EINVAL;

	}



	if (pm_status > 0) {

		pm_runtime_mark_last_busy(&client->dev);

	if (pm_status > 0)

		pm_runtime_put_autosuspend(&client->dev);

	}



	return rval;

}
@@ -1914,7 +1912,6 @@ static int ccs_set_stream(struct v4l2_subdev *subdev, int enable) 
	if (!enable) {

		ccs_stop_streaming(sensor);

		sensor->streaming = false;

		pm_runtime_mark_last_busy(&client->dev);

		pm_runtime_put_autosuspend(&client->dev);



		return 0;
@@ -1929,7 +1926,6 @@ static int ccs_set_stream(struct v4l2_subdev *subdev, int enable) 
	rval = ccs_start_streaming(sensor);

	if (rval < 0) {

		sensor->streaming = false;

		pm_runtime_mark_last_busy(&client->dev);

		pm_runtime_put_autosuspend(&client->dev);

	}
@@ -2677,7 +2673,6 @@ nvm_show(struct device *dev, struct device_attribute *attr, char *buf) 
		return -ENODEV;

	}



	pm_runtime_mark_last_busy(&client->dev);

	pm_runtime_put_autosuspend(&client->dev);



	/*

drivers/media/i2c/dw9768.c

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ static int dw9768_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 


static int dw9768_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)

{

	pm_runtime_mark_last_busy(sd->dev);

	pm_runtime_put_autosuspend(sd->dev);



	return 0;

drivers/media/i2c/gc0308.c

+0 −3
Original line number Diff line number Diff line
@@ -974,7 +974,6 @@ static int gc0308_s_ctrl(struct v4l2_ctrl *ctrl) 
	if (ret)

		dev_err(gc0308->dev, "failed to set control: %d\n", ret);



	pm_runtime_mark_last_busy(gc0308->dev);

	pm_runtime_put_autosuspend(gc0308->dev);



	return ret;
@@ -1157,14 +1156,12 @@ static int gc0308_start_stream(struct gc0308 *gc0308) 
	return 0;



disable_pm:

	pm_runtime_mark_last_busy(gc0308->dev);

	pm_runtime_put_autosuspend(gc0308->dev);

	return ret;

}



static int gc0308_stop_stream(struct gc0308 *gc0308)

{

	pm_runtime_mark_last_busy(gc0308->dev);

	pm_runtime_put_autosuspend(gc0308->dev);

	return 0;

}

drivers/media/i2c/gc2145.c

+0 −3
Original line number Diff line number Diff line
@@ -963,7 +963,6 @@ static int gc2145_enable_streams(struct v4l2_subdev *sd, 
	return 0;



err_rpm_put:

	pm_runtime_mark_last_busy(&client->dev);

	pm_runtime_put_autosuspend(&client->dev);

	return ret;

}
@@ -985,7 +984,6 @@ static int gc2145_disable_streams(struct v4l2_subdev *sd, 
	if (ret)

		dev_err(&client->dev, "%s failed to write regs\n", __func__);



	pm_runtime_mark_last_busy(&client->dev);

	pm_runtime_put_autosuspend(&client->dev);



	return ret;
@@ -1193,7 +1191,6 @@ static int gc2145_s_ctrl(struct v4l2_ctrl *ctrl) 
		break;

	}



	pm_runtime_mark_last_busy(&client->dev);

	pm_runtime_put_autosuspend(&client->dev);



	return ret;