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

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

Mauro briefly writes:
  "media fixes for v4.19-rc5

   some drivers and Kbuild fixes"

* tag 'media/v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: platform: fix cros-ec-cec build error
  media: staging/media/mt9t031/Kconfig: remove bogus entry
  media: i2c: mt9v111: Fix v4l2-ctrl error handling
  media: camss: add missing includes
  media: camss: Use managed memory allocations
  media: camss: mark PM functions as __maybe_unused
  media: af9035: prevent buffer overflow on write
  media: video_function_calls.rst: drop obsolete video-set-attributes reference
parents 6bf4ca7f 324493fb

Documentation/media/uapi/dvb/video_function_calls.rst

+0 −1
Original line number Diff line number Diff line
@@ -33,4 +33,3 @@ Video Function Calls 
    video-clear-buffer

    video-set-streamtype

    video-set-format
 
    video-set-attributes

drivers/media/i2c/mt9v111.c

+13 −28
Original line number Diff line number Diff line
@@ -1159,41 +1159,21 @@ static int mt9v111_probe(struct i2c_client *client) 
					      V4L2_CID_AUTO_WHITE_BALANCE,

					      0, 1, 1,

					      V4L2_WHITE_BALANCE_AUTO);

	if (IS_ERR_OR_NULL(mt9v111->auto_awb)) {

		ret = PTR_ERR(mt9v111->auto_awb);

		goto error_free_ctrls;

	}



	mt9v111->auto_exp = v4l2_ctrl_new_std_menu(&mt9v111->ctrls,

						   &mt9v111_ctrl_ops,

						   V4L2_CID_EXPOSURE_AUTO,

						   V4L2_EXPOSURE_MANUAL,

						   0, V4L2_EXPOSURE_AUTO);

	if (IS_ERR_OR_NULL(mt9v111->auto_exp)) {

		ret = PTR_ERR(mt9v111->auto_exp);

		goto error_free_ctrls;

	}



	/* Initialize timings */

	mt9v111->hblank = v4l2_ctrl_new_std(&mt9v111->ctrls, &mt9v111_ctrl_ops,

					    V4L2_CID_HBLANK,

					    MT9V111_CORE_R05_MIN_HBLANK,

					    MT9V111_CORE_R05_MAX_HBLANK, 1,

					    MT9V111_CORE_R05_DEF_HBLANK);

	if (IS_ERR_OR_NULL(mt9v111->hblank)) {

		ret = PTR_ERR(mt9v111->hblank);

		goto error_free_ctrls;

	}



	mt9v111->vblank = v4l2_ctrl_new_std(&mt9v111->ctrls, &mt9v111_ctrl_ops,

					    V4L2_CID_VBLANK,

					    MT9V111_CORE_R06_MIN_VBLANK,

					    MT9V111_CORE_R06_MAX_VBLANK, 1,

					    MT9V111_CORE_R06_DEF_VBLANK);

	if (IS_ERR_OR_NULL(mt9v111->vblank)) {

		ret = PTR_ERR(mt9v111->vblank);

		goto error_free_ctrls;

	}



	/* PIXEL_RATE is fixed: just expose it to user space. */

	v4l2_ctrl_new_std(&mt9v111->ctrls, &mt9v111_ctrl_ops,
@@ -1201,6 +1181,10 @@ static int mt9v111_probe(struct i2c_client *client) 
			  DIV_ROUND_CLOSEST(mt9v111->sysclk, 2), 1,

			  DIV_ROUND_CLOSEST(mt9v111->sysclk, 2));



	if (mt9v111->ctrls.error) {

		ret = mt9v111->ctrls.error;

		goto error_free_ctrls;

	}

	mt9v111->sd.ctrl_handler = &mt9v111->ctrls;



	/* Start with default configuration: 640x480 UYVY. */
@@ -1226,26 +1210,27 @@ static int mt9v111_probe(struct i2c_client *client) 
	mt9v111->pad.flags	= MEDIA_PAD_FL_SOURCE;

	ret = media_entity_pads_init(&mt9v111->sd.entity, 1, &mt9v111->pad);

	if (ret)

		goto error_free_ctrls;

		goto error_free_entity;

#endif



	ret = mt9v111_chip_probe(mt9v111);

	if (ret)

		goto error_free_ctrls;

		goto error_free_entity;



	ret = v4l2_async_register_subdev(&mt9v111->sd);

	if (ret)

		goto error_free_ctrls;

		goto error_free_entity;



	return 0;



error_free_ctrls:

	v4l2_ctrl_handler_free(&mt9v111->ctrls);



error_free_entity:

#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&mt9v111->sd.entity);

#endif



error_free_ctrls:

	v4l2_ctrl_handler_free(&mt9v111->ctrls);



	mutex_destroy(&mt9v111->pwr_mutex);

	mutex_destroy(&mt9v111->stream_mutex);
@@ -1259,12 +1244,12 @@ static int mt9v111_remove(struct i2c_client *client) 


	v4l2_async_unregister_subdev(sd);



	v4l2_ctrl_handler_free(&mt9v111->ctrls);



#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&sd->entity);

#endif



	v4l2_ctrl_handler_free(&mt9v111->ctrls);



	mutex_destroy(&mt9v111->pwr_mutex);

	mutex_destroy(&mt9v111->stream_mutex);

drivers/media/platform/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -541,6 +541,8 @@ config VIDEO_CROS_EC_CEC 
	depends on MFD_CROS_EC

	select CEC_CORE

	select CEC_NOTIFIER

	select CHROME_PLATFORMS

	select CROS_EC_PROTO

	---help---

	  If you say yes here you will get support for the

	  ChromeOS Embedded Controller's CEC.

drivers/media/platform/qcom/camss/camss-csid.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/clk.h>

#include <linux/completion.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/platform_device.h>

drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/io.h>



#define CAMSS_CSI_PHY_LNn_CFG2(n)		(0x004 + 0x40 * (n))

#define CAMSS_CSI_PHY_LNn_CFG3(n)		(0x008 + 0x40 * (n))

CRA Git | Maintained and supported by SUSTech CRA and CCSE