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

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

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

Pull fbdev fixes from Tomi Valkeinen:
 "A few minor fbdev fixes for bfin_adv7393fb, omapdss, vt8500lcdfb,
  atmel_lcdfb"

* tag 'fbdev-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  fb: adv7393: add missing semicolon
  video: omapdss: Fix potential null pointer dereference
  video: vt8500lcdfb: Remove kfree call since devm_kzalloc() is used
  drivers:video:fbdev atmel_lcdfb.c power GPIO registration bug
parents 4f231749 0b479c3d

drivers/video/fbdev/atmel_lcdfb.c

+2 −0
Original line number Diff line number Diff line
@@ -1057,6 +1057,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) 
		goto put_display_node;

	}



	INIT_LIST_HEAD(&pdata->pwr_gpios);

	ret = -ENOMEM;

	for (i = 0; i < of_gpio_named_count(display_np, "atmel,power-control-gpio"); i++) {

		gpio = of_get_named_gpio_flags(display_np, "atmel,power-control-gpio",
@@ -1082,6 +1083,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) 
			dev_err(dev, "set direction output gpio %d failed\n", gpio);

			goto put_display_node;

		}

		list_add(&og->list, &pdata->pwr_gpios);

	}



	if (is_gpio_power)

drivers/video/fbdev/bfin_adv7393fb.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static int bfin_adv7393_fb_probe(struct i2c_client *client, 
	/* Workaround "PPI Does Not Start Properly In Specific Mode" */

	if (ANOMALY_05000400) {

		ret = gpio_request_one(P_IDENT(P_PPI0_FS3), GPIOF_OUT_INIT_LOW,

					"PPI0_FS3")

					"PPI0_FS3");

		if (ret) {

			dev_err(&client->dev, "PPI0_FS3 GPIO request failed\n");

			ret = -EBUSY;

drivers/video/fbdev/omap2/dss/omapdss-boot-init.c

+5 −3
Original line number Diff line number Diff line
@@ -121,10 +121,12 @@ static void __init omapdss_add_to_list(struct device_node *node, bool root) 
{

	struct dss_conv_node *n = kmalloc(sizeof(struct dss_conv_node),

		GFP_KERNEL);

	if (n) {

		n->node = node;

		n->root = root;

		list_add(&n->list, &dss_conv_list);

	}

}



static bool __init omapdss_list_contains(const struct device_node *node)

{

drivers/video/fbdev/vt8500lcdfb.c

+0 −2
Original line number Diff line number Diff line
@@ -474,8 +474,6 @@ static int vt8500lcd_remove(struct platform_device *pdev) 
	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	release_mem_region(res->start, resource_size(res));



	kfree(fbi);



	return 0;

}