History

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

Linus Torvalds committed 13 years ago

Commit d3aa0262 parents e1f8826 6d0bb8110 files · +15 −30Browse files

Unified · Split

10 files
  1. drivers/video/mmp/hw/mmp_ctrl.c +2 −15
  2. drivers/video/mxsfb.c +1 −0
  3. drivers/video/neofb.c +3 −1
  4. drivers/video/of_display_timing.c +3 −3
  5. drivers/video/omap2/displays-new/Kconfig +1 −0
  6. drivers/video/omap2/displays-new/connector-analog-tv.c +1 −1
  7. drivers/video/omap2/displays-new/connector-dvi.c +1 −1
  8. drivers/video/omap2/displays-new/connector-hdmi.c +1 −1
  9. drivers/video/omap2/dss/dispc.c +1 −0
  10. drivers/video/s3fb.c +1 −8
drivers/video/mmp/hw/mmp_ctrl.c+2−15
@@ -514,7 +514,7 @@ static int mmphw_probe(struct platform_device *pdev) · 513 unmodified lines
514514 if (IS_ERR(ctrl->clk)) {
515515 dev_err(ctrl->dev, "unable to get clk %s\n", mi->clk_name);
516516 ret = -ENOENT;
517− goto failed_get_clk;
517+ goto failed;
518518 }
519519 clk_prepare_enable(ctrl->clk);
520520
@@ -551,21 +551,8 @@ failed_path_init: · 30 unmodified lines
551551 path_deinit(path_plat);
552552 }
553553
554− if (ctrl->clk) {
555− devm_clk_put(ctrl->dev, ctrl->clk);
556− clk_disable_unprepare(ctrl->clk);
557− }
558−failed_get_clk:
559− devm_free_irq(ctrl->dev, ctrl->irq, ctrl);
554+ clk_disable_unprepare(ctrl->clk);
560555 failed:
561− if (ctrl) {
562− if (ctrl->reg_base)
563− devm_iounmap(ctrl->dev, ctrl->reg_base);
564− devm_release_mem_region(ctrl->dev, res->start,
565− resource_size(res));
566− devm_kfree(ctrl->dev, ctrl);
567− }
568−
569556 dev_err(&pdev->dev, "device init failed\n");
570557
571558 return ret;
drivers/video/mxsfb.c+1−0
@@ -620,6 +620,7 @@ static int mxsfb_restore_mode(struct mxsfb_info *host) · 619 unmodified lines
620620 break;
621621 case 3:
622622 bits_per_pixel = 32;
623+ break;
623624 case 1:
624625 default:
625626 return -EINVAL;
drivers/video/neofb.c+3−1
@@ -2075,6 +2075,7 @@ static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id) · 2074 unmodified lines
20752075 if (!fb_find_mode(&info->var, info, mode_option, NULL, 0,
20762076 info->monspecs.modedb, 16)) {
20772077 printk(KERN_ERR "neofb: Unable to find usable video mode.\n");
2078+ err = -EINVAL;
20782079 goto err_map_video;
20792080 }
20802081
@@ -2097,7 +2098,8 @@ static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id) · 16 unmodified lines
20972098 info->fix.smem_len >> 10, info->var.xres,
20982099 info->var.yres, h_sync / 1000, h_sync % 1000, v_sync);
20992100
2100− if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
2101+ err = fb_alloc_cmap(&info->cmap, 256, 0);
2102+ if (err < 0)
21012103 goto err_map_video;
21022104
21032105 err = register_framebuffer(info);
drivers/video/of_display_timing.c+3−3
@@ -120,7 +120,7 @@ int of_get_display_timing(struct device_node *np, const char *name, · 119 unmodified lines
120120 return -EINVAL;
121121 }
122122
123− timing_np = of_find_node_by_name(np, name);
123+ timing_np = of_get_child_by_name(np, name);
124124 if (!timing_np) {
125125 pr_err("%s: could not find node '%s'\n",
126126 of_node_full_name(np), name);
@@ -143,11 +143,11 @@ struct display_timings *of_get_display_timings(struct device_node *np) · 16 unmodified lines
143143 struct display_timings *disp;
144144
145145 if (!np) {
146− pr_err("%s: no devicenode given\n", of_node_full_name(np));
146+ pr_err("%s: no device node given\n", of_node_full_name(np));
147147 return NULL;
148148 }
149149
150− timings_np = of_find_node_by_name(np, "display-timings");
150+ timings_np = of_get_child_by_name(np, "display-timings");
151151 if (!timings_np) {
152152 pr_err("%s: could not find display-timings node\n",
153153 of_node_full_name(np));
drivers/video/omap2/displays-new/Kconfig+1−0
@@ -35,6 +35,7 @@ config DISPLAY_PANEL_DPI · 34 unmodified lines
3535
3636 config DISPLAY_PANEL_DSI_CM
3737 tristate "Generic DSI Command Mode Panel"
38+ depends on BACKLIGHT_CLASS_DEVICE
3839 help
3940 Driver for generic DSI command mode panels.
4041
drivers/video/omap2/displays-new/connector-analog-tv.c+1−1
@@ -191,7 +191,7 @@ static int tvc_probe_pdata(struct platform_device *pdev) · 190 unmodified lines
191191 in = omap_dss_find_output(pdata->source);
192192 if (in == NULL) {
193193 dev_err(&pdev->dev, "Failed to find video source\n");
194− return -ENODEV;
194+ return -EPROBE_DEFER;
195195 }
196196
197197 ddata->in = in;
drivers/video/omap2/displays-new/connector-dvi.c+1−1
@@ -263,7 +263,7 @@ static int dvic_probe_pdata(struct platform_device *pdev) · 262 unmodified lines
263263 in = omap_dss_find_output(pdata->source);
264264 if (in == NULL) {
265265 dev_err(&pdev->dev, "Failed to find video source\n");
266− return -ENODEV;
266+ return -EPROBE_DEFER;
267267 }
268268
269269 ddata->in = in;
drivers/video/omap2/displays-new/connector-hdmi.c+1−1
@@ -290,7 +290,7 @@ static int hdmic_probe_pdata(struct platform_device *pdev) · 289 unmodified lines
290290 in = omap_dss_find_output(pdata->source);
291291 if (in == NULL) {
292292 dev_err(&pdev->dev, "Failed to find video source\n");
293− return -ENODEV;
293+ return -EPROBE_DEFER;
294294 }
295295
296296 ddata->in = in;
drivers/video/omap2/dss/dispc.c+1−0
@@ -3691,6 +3691,7 @@ static int __init omap_dispchw_probe(struct platform_device *pdev) · 3690 unmodified lines
36913691 }
36923692
36933693 pm_runtime_enable(&pdev->dev);
3694+ pm_runtime_irq_safe(&pdev->dev);
36943695
36953696 r = dispc_runtime_get();
36963697 if (r)
drivers/video/s3fb.c+1−8
@@ -1336,14 +1336,7 @@ static int s3_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) · 1335 unmodified lines
13361336 (info->var.bits_per_pixel * info->var.xres_virtual);
13371337 if (info->var.yres_virtual < info->var.yres) {
13381338 dev_err(info->device, "virtual vertical size smaller than real\n");
1339− goto err_find_mode;
1340− }
1341−
1342− /* maximize virtual vertical size for fast scrolling */
1343− info->var.yres_virtual = info->fix.smem_len * 8 /
1344− (info->var.bits_per_pixel * info->var.xres_virtual);
1345− if (info->var.yres_virtual < info->var.yres) {
1346− dev_err(info->device, "virtual vertical size smaller than real\n");
1339+ rc = -EINVAL;
13471340 goto err_find_mode;
13481341 }
13491342

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t