Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e82fa92e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-fixes-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux 

Pull fbdev fixes from Tomi Valkeinen:

 - fbdev: Minor fixes to broadsheetfb, fsl-diu-fb, mb862xxfb, tridentfb,
   omapfb

 - display-timing: Fix memory leak in error path

* tag 'fbdev-fixes-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  video: of: fix memory leak
  fbdev: broadsheetfb: fix memory leak
  OMAPDSS: panel-sony-acx565akm: Export OF module alias information
  fbdev: omap2: connector-dvi: use of_get_i2c_adapter_by_node interface
  tridentfb: Fix set_lwidth on TGUI9440 and CYBER9320
  tridentfb: fix hang on Blade3D with CONFIG_CC_OPTIMIZE_FOR_SIZE
  video: fbdev: mb862xx: Fix module autoload for OF platform driver
  video: fbdev: fsl: Fix the sleep function for FSL DIU module
parents 8ace60f8 d663baba

drivers/video/fbdev/broadsheetfb.c

+5 −3
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ static ssize_t broadsheet_loadstore_waveform(struct device *dev, 
	if ((fw_entry->size < 8*1024) || (fw_entry->size > 64*1024)) {

		dev_err(dev, "Invalid waveform\n");

		err = -EINVAL;

		goto err_failed;

		goto err_fw;

	}



	mutex_lock(&(par->io_lock));
@@ -762,13 +762,15 @@ static ssize_t broadsheet_loadstore_waveform(struct device *dev, 
	mutex_unlock(&(par->io_lock));

	if (err < 0) {

		dev_err(dev, "Failed to store broadsheet waveform\n");

		goto err_failed;

		goto err_fw;

	}



	dev_info(dev, "Stored broadsheet waveform, size %zd\n", fw_entry->size);



	return len;

	err = len;



err_fw:

	release_firmware(fw_entry);

err_failed:

	return err;

}

drivers/video/fbdev/fsl-diu-fb.c

+8 −1
Original line number Diff line number Diff line
@@ -1628,9 +1628,16 @@ static int fsl_diu_suspend(struct platform_device *ofdev, pm_message_t state) 
static int fsl_diu_resume(struct platform_device *ofdev)

{

	struct fsl_diu_data *data;

	unsigned int i;



	data = dev_get_drvdata(&ofdev->dev);

	enable_lcdc(data->fsl_diu_info);



	fsl_diu_enable_interrupts(data);

	update_lcdc(data->fsl_diu_info);

	for (i = 0; i < NUM_AOIS; i++) {

		if (data->mfb[i].count)

			fsl_diu_enable_panel(&data->fsl_diu_info[i]);

	}



	return 0;

}

drivers/video/fbdev/mb862xx/mb862xxfbdrv.c

+1 −0
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ static struct of_device_id of_platform_mb862xx_tbl[] = { 
	{ .compatible = "fujitsu,coral", },

	{ /* end */ }

};

MODULE_DEVICE_TABLE(of, of_platform_mb862xx_tbl);



static struct platform_driver of_platform_mb862xxfb_driver = {

	.driver = {

drivers/video/fbdev/omap2/displays-new/connector-dvi.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int dvic_probe_of(struct platform_device *pdev) 


	adapter_node = of_parse_phandle(node, "ddc-i2c-bus", 0);

	if (adapter_node) {

		adapter = of_find_i2c_adapter_by_node(adapter_node);

		adapter = of_get_i2c_adapter_by_node(adapter_node);

		if (adapter == NULL) {

			dev_err(&pdev->dev, "failed to parse ddc-i2c-bus\n");

			omap_dss_put_device(ddata->in);

drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c

+1 −0
Original line number Diff line number Diff line
@@ -898,6 +898,7 @@ static const struct of_device_id acx565akm_of_match[] = { 
	{ .compatible = "omapdss,sony,acx565akm", },

	{},

};

MODULE_DEVICE_TABLE(of, acx565akm_of_match);



static struct spi_driver acx565akm_driver = {

	.driver = {