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

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

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

Pull fbdev fixes from Tomi Valkeinen:
 "Small fbdev fixes for various fb drivers"

* tag 'fbdev-fixes-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  video: mxsfb: Add missing break
  video: of: display_timing: correct display-timings node finding
  neofb: fix error return code in neofb_probe()
  s3fb: fix error return code in s3_pci_probe()
  video: mmp: drop needless devm cleanup
  OMAPDSS: Add missing dependency on backlight for DSI-CM panel drier
  OMAPDSS: DISPC: set irq_safe for runtime PM
  OMAPDSS: Return right error during connector probe
parents e1f8826f 6d0bb818

drivers/video/mmp/hw/mmp_ctrl.c

+2 −15
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static int mmphw_probe(struct platform_device *pdev) 
	if (IS_ERR(ctrl->clk)) {

		dev_err(ctrl->dev, "unable to get clk %s\n", mi->clk_name);

		ret = -ENOENT;

		goto failed_get_clk;

		goto failed;

	}

	clk_prepare_enable(ctrl->clk);
@@ -551,21 +551,8 @@ static int mmphw_probe(struct platform_device *pdev) 
		path_deinit(path_plat);

	}



	if (ctrl->clk) {

		devm_clk_put(ctrl->dev, ctrl->clk);

	clk_disable_unprepare(ctrl->clk);

	}

failed_get_clk:

	devm_free_irq(ctrl->dev, ctrl->irq, ctrl);

failed:

	if (ctrl) {

		if (ctrl->reg_base)

			devm_iounmap(ctrl->dev, ctrl->reg_base);

		devm_release_mem_region(ctrl->dev, res->start,

				resource_size(res));

		devm_kfree(ctrl->dev, ctrl);

	}



	dev_err(&pdev->dev, "device init failed\n");



	return ret;

drivers/video/mxsfb.c

+1 −0
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ static int mxsfb_restore_mode(struct mxsfb_info *host) 
		break;

	case 3:

		bits_per_pixel = 32;

		break;

	case 1:

	default:

		return -EINVAL;

drivers/video/neofb.c

+3 −1
Original line number Diff line number Diff line
@@ -2075,6 +2075,7 @@ static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	if (!fb_find_mode(&info->var, info, mode_option, NULL, 0,

			info->monspecs.modedb, 16)) {

		printk(KERN_ERR "neofb: Unable to find usable video mode.\n");

		err = -EINVAL;

		goto err_map_video;

	}
@@ -2097,7 +2098,8 @@ static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	       info->fix.smem_len >> 10, info->var.xres,

	       info->var.yres, h_sync / 1000, h_sync % 1000, v_sync);



	if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)

	err = fb_alloc_cmap(&info->cmap, 256, 0);

	if (err < 0)

		goto err_map_video;



	err = register_framebuffer(info);

drivers/video/of_display_timing.c

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int of_get_display_timing(struct device_node *np, const char *name, 
		return -EINVAL;

	}



	timing_np = of_find_node_by_name(np, name);

	timing_np = of_get_child_by_name(np, name);

	if (!timing_np) {

		pr_err("%s: could not find node '%s'\n",

			of_node_full_name(np), name);
@@ -147,7 +147,7 @@ struct display_timings *of_get_display_timings(struct device_node *np) 
		return NULL;

	}



	timings_np = of_find_node_by_name(np, "display-timings");

	timings_np = of_get_child_by_name(np, "display-timings");

	if (!timings_np) {

		pr_err("%s: could not find display-timings node\n",

			of_node_full_name(np));

drivers/video/omap2/displays-new/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ config DISPLAY_PANEL_DPI 


config DISPLAY_PANEL_DSI_CM

	tristate "Generic DSI Command Mode Panel"

	depends on BACKLIGHT_CLASS_DEVICE

	help

	  Driver for generic DSI command mode panels.