Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-6
+2
drivers/video/fbdev/atmel_lcdfb.c
+2
drivers/video/fbdev/atmel_lcdfb.c
···
1057
1057
goto put_display_node;
1058
1058
}
1059
1059
1060
+
INIT_LIST_HEAD(&pdata->pwr_gpios);
1060
1061
ret = -ENOMEM;
1061
1062
for (i = 0; i < of_gpio_named_count(display_np, "atmel,power-control-gpio"); i++) {
1062
1063
gpio = of_get_named_gpio_flags(display_np, "atmel,power-control-gpio",
···
1083
1082
dev_err(dev, "set direction output gpio %d failed\n", gpio);
1084
1083
goto put_display_node;
1085
1084
}
1085
+
list_add(&og->list, &pdata->pwr_gpios);
1086
1086
}
1087
1087
1088
1088
if (is_gpio_power)
+1
-1
drivers/video/fbdev/bfin_adv7393fb.c
+1
-1
drivers/video/fbdev/bfin_adv7393fb.c
···
408
408
/* Workaround "PPI Does Not Start Properly In Specific Mode" */
409
409
if (ANOMALY_05000400) {
410
410
ret = gpio_request_one(P_IDENT(P_PPI0_FS3), GPIOF_OUT_INIT_LOW,
411
-
"PPI0_FS3")
411
+
"PPI0_FS3");
412
412
if (ret) {
413
413
dev_err(&client->dev, "PPI0_FS3 GPIO request failed\n");
414
414
ret = -EBUSY;
+5
-3
drivers/video/fbdev/omap2/dss/omapdss-boot-init.c
+5
-3
drivers/video/fbdev/omap2/dss/omapdss-boot-init.c
···
121
121
{
122
122
struct dss_conv_node *n = kmalloc(sizeof(struct dss_conv_node),
123
123
GFP_KERNEL);
124
-
n->node = node;
125
-
n->root = root;
126
-
list_add(&n->list, &dss_conv_list);
124
+
if (n) {
125
+
n->node = node;
126
+
n->root = root;
127
+
list_add(&n->list, &dss_conv_list);
128
+
}
127
129
}
128
130
129
131
static bool __init omapdss_list_contains(const struct device_node *node)