Commit 70a3067d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "Another set of fixes for Kernel 3.10.

  This series contain:
   - two Kbuild fixes for randconfig
   - a buffer overflow when using rtl28xuu with r820t tuner
   - one clk fixup on exynos4-is driver"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] Fix build when drivers are builtin and frontend modules
  [media] s5p makefiles: don't override other selections on obj-[ym]
  [media] exynos4-is: Fix FIMC-IS clocks initialization
  [media] rtl28xxu: fix buffer overflow when probing Rafael Micro r820t tuner
parents b8ff768b bb69ee27

drivers/media/Kconfig

+9 −3
Original line number Diff line number Diff line
@@ -189,6 +189,12 @@ config MEDIA_SUBDRV_AUTOSELECT 


	  If unsure say Y.



config MEDIA_ATTACH

	bool

	depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT

	depends on MODULES

	default MODULES



source "drivers/media/i2c/Kconfig"

source "drivers/media/tuners/Kconfig"

source "drivers/media/dvb-frontends/Kconfig"

drivers/media/platform/exynos4-is/fimc-is.c

+8 −18
Original line number Diff line number Diff line
@@ -834,23 +834,11 @@ static int fimc_is_probe(struct platform_device *pdev) 
		goto err_clk;

	}

	pm_runtime_enable(dev);

	/*

	 * Enable only the ISP power domain, keep FIMC-IS clocks off until

	 * the whole clock tree is configured. The ISP power domain needs

	 * be active in order to acces any CMU_ISP clock registers.

	 */

	ret = pm_runtime_get_sync(dev);

	if (ret < 0)

		goto err_irq;



	ret = fimc_is_setup_clocks(is);

	pm_runtime_put_sync(dev);



	ret = pm_runtime_get_sync(dev);

	if (ret < 0)

		goto err_irq;



	is->clk_init = true;



	is->alloc_ctx = vb2_dma_contig_init_ctx(dev);

	if (IS_ERR(is->alloc_ctx)) {

		ret = PTR_ERR(is->alloc_ctx);
@@ -872,6 +860,8 @@ static int fimc_is_probe(struct platform_device *pdev) 
	if (ret < 0)

		goto err_dfs;



	pm_runtime_put_sync(dev);



	dev_dbg(dev, "FIMC-IS registered successfully\n");

	return 0;
@@ -891,9 +881,11 @@ err_clk: 
static int fimc_is_runtime_resume(struct device *dev)

{

	struct fimc_is *is = dev_get_drvdata(dev);

	int ret;



	if (!is->clk_init)

		return 0;

	ret = fimc_is_setup_clocks(is);

	if (ret)

		return ret;



	return fimc_is_enable_clocks(is);

}
@@ -902,9 +894,7 @@ static int fimc_is_runtime_suspend(struct device *dev) 
{

	struct fimc_is *is = dev_get_drvdata(dev);



	if (is->clk_init)

	fimc_is_disable_clocks(is);



	return 0;

}

drivers/media/platform/exynos4-is/fimc-is.h

+0 −1
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ struct fimc_is { 
	spinlock_t			slock;



	struct clk			*clocks[ISS_CLKS_MAX];

	bool				clk_init;

	void __iomem			*regs;

	void __iomem			*pmu_regs;

	int				irq;

drivers/media/platform/s5p-jpeg/Makefile

+1 −1
Original line number Diff line number Diff line 
s5p-jpeg-objs := jpeg-core.o

obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) := s5p-jpeg.o
 
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg.o

drivers/media/platform/s5p-mfc/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) := s5p-mfc.o

obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc.o

s5p-mfc-y += s5p_mfc.o s5p_mfc_intr.o

s5p-mfc-y += s5p_mfc_dec.o s5p_mfc_enc.o

s5p-mfc-y += s5p_mfc_ctrl.o s5p_mfc_pm.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE