mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-18 00:24:39 +00:00
fbdev fixes for v4.3
* fbdev: Minor fixes to broadsheetfb, fsl-diu-fb, mb862xxfb, tridentfb, omapfb * display-timing: Fix memory leak in error path -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWFQlvAAoJEPo9qoy8lh711iYQAK4tBVPRPRPgNFkCWfeqaRvd UvJcLrsVddmwFqQj+CW+PxHWqhFEcSRFaaJmWirBAtumGCAYxy2BeFjY6H32JzvK tFVIwt1GuaO+89d3xq6AuvamiH9X4pPuu/bVfIWAP4hfpKsuKAQ+UtdPHRsRTkBe 2PVKLc4ghxPMnp0XdcDYRmJ0RrejctISmmelScc6waqhRC8+bnEcVZB5CP/N8iM9 +PvoxmS2e7Cn6ZxMMqSrEsFwpqtxuUhzrIEVrcbfAnymp37uiKai76FJe1JEev3T gXnqXAsfMbdNjtVpHQVeb3B43ZsslEruXOQZHyhW9CH2+7QgOsVfE9PDyIEDxM+9 UZH8jLwh0EhLhnfBMBmeUmy9mQXXUhyQ5qBXJ4ubBc304tS/2LnVvh507WbzKEhY 2gk0ZmqsSzpn1+NoZ0HEkZM1toG7sWEo/KuYehyifzNrPikG6jzPqbdF64ZED5Ev mS+fOfIus4vCXX/7cf4waDXzOhlZl+arAEOM1+FK9bE80JPZnK1xZQain7wrPSHR uaM5AAtbPSVj3w5lk1ntY7ck/2R+DRKjwVGr8Qm7EdWnE5LQcUrS619q77Y9NJ7r sqnfMToKarqAnfcU/4sQ2ObV8nfhsZQimeffOBVRnbMlRIo7aD+d+n4WXAICNvH+ 3A/vqTo/pbWL9TBXce/E =hZoA -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
e82fa92e62
7 changed files with 26 additions and 8 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -226,7 +226,7 @@ static void blade_image_blit(struct tridentfb_par *par, const char *data,
|
|||
writemmr(par, DST1, point(x, y));
|
||||
writemmr(par, DST2, point(x + w - 1, y + h - 1));
|
||||
|
||||
memcpy(par->io_virt + 0x10000, data, 4 * size);
|
||||
iowrite32_rep(par->io_virt + 0x10000, data, size);
|
||||
}
|
||||
|
||||
static void blade_copy_rect(struct tridentfb_par *par,
|
||||
|
@ -673,6 +673,12 @@ static int get_nativex(struct tridentfb_par *par)
|
|||
static inline void set_lwidth(struct tridentfb_par *par, int width)
|
||||
{
|
||||
write3X4(par, VGA_CRTC_OFFSET, width & 0xFF);
|
||||
/* chips older than TGUI9660 have only 1 width bit in AddColReg */
|
||||
/* touching the other one breaks I2C/DDC */
|
||||
if (par->chip_id == TGUI9440 || par->chip_id == CYBER9320)
|
||||
write3X4(par, AddColReg,
|
||||
(read3X4(par, AddColReg) & 0xEF) | ((width & 0x100) >> 4));
|
||||
else
|
||||
write3X4(par, AddColReg,
|
||||
(read3X4(par, AddColReg) & 0xCF) | ((width & 0x300) >> 4));
|
||||
}
|
||||
|
|
|
@ -210,6 +210,7 @@ struct display_timings *of_get_display_timings(struct device_node *np)
|
|||
*/
|
||||
pr_err("%s: error in timing %d\n",
|
||||
of_node_full_name(np), disp->num_timings + 1);
|
||||
kfree(dt);
|
||||
goto timingfail;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue