Merge tag 'fbdev-fixes-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux (d3aa0269) · Commits · 戴 / test

drivers/video/mmp/hw/mmp_ctrl.c

+2 −15

Original line number	Original line	Diff line number	Diff line
	@@ -514,7 +514,7 @@ static int mmphw_probe(struct platform_device *pdev)
	if (IS_ERR(ctrl->clk)) {		if (IS_ERR(ctrl->clk)) {
	dev_err(ctrl->dev, "unable to get clk %s\n", mi->clk_name);		dev_err(ctrl->dev, "unable to get clk %s\n", mi->clk_name);
	ret = -ENOENT;		ret = -ENOENT;
	goto failed_get_clk;		goto failed;
	}		}
	clk_prepare_enable(ctrl->clk);		clk_prepare_enable(ctrl->clk);

	@@ -551,21 +551,8 @@ failed_path_init:
	path_deinit(path_plat);		path_deinit(path_plat);
	}		}

	if (ctrl->clk) {
	devm_clk_put(ctrl->dev, ctrl->clk);
	clk_disable_unprepare(ctrl->clk);		clk_disable_unprepare(ctrl->clk);
	}
	failed_get_clk:
	devm_free_irq(ctrl->dev, ctrl->irq, ctrl);
	failed:		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");		dev_err(&pdev->dev, "device init failed\n");

	return ret;		return ret;

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -620,6 +620,7 @@ static int mxsfb_restore_mode(struct mxsfb_info *host)
	break;		break;
	case 3:		case 3:
	bits_per_pixel = 32;		bits_per_pixel = 32;
			break;
	case 1:		case 1:
	default:		default:
	return -EINVAL;		return -EINVAL;

+3 −1

Original line number	Original line	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,		if (!fb_find_mode(&info->var, info, mode_option, NULL, 0,
	info->monspecs.modedb, 16)) {		info->monspecs.modedb, 16)) {
	printk(KERN_ERR "neofb: Unable to find usable video mode.\n");		printk(KERN_ERR "neofb: Unable to find usable video mode.\n");
			err = -EINVAL;
	goto err_map_video;		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->fix.smem_len >> 10, info->var.xres,
	info->var.yres, h_sync / 1000, h_sync % 1000, v_sync);		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;		goto err_map_video;

	err = register_framebuffer(info);		err = register_framebuffer(info);

+3 −3

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

	timing_np = of_find_node_by_name(np, name);		timing_np = of_get_child_by_name(np, name);
	if (!timing_np) {		if (!timing_np) {
	pr_err("%s: could not find node '%s'\n",		pr_err("%s: could not find node '%s'\n",
	of_node_full_name(np), name);		of_node_full_name(np), name);
	@@ -147,7 +147,7 @@ struct display_timings of_get_display_timings(struct device_node np)
	return NULL;		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) {		if (!timings_np) {
	pr_err("%s: could not find display-timings node\n",		pr_err("%s: could not find display-timings node\n",
	of_node_full_name(np));		of_node_full_name(np));

+1 −0

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

	config DISPLAY_PANEL_DSI_CM		config DISPLAY_PANEL_DSI_CM
	tristate "Generic DSI Command Mode Panel"		tristate "Generic DSI Command Mode Panel"
			depends on BACKLIGHT_CLASS_DEVICE
	help		help
	Driver for generic DSI command mode panels.		Driver for generic DSI command mode panels.