diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/video/carminefb.c | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/video/carminefb.c')
| -rw-r--r-- | drivers/video/carminefb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c index 65f7c15..153dd65 100644 --- a/drivers/video/carminefb.c +++ b/drivers/video/carminefb.c @@ -585,7 +585,8 @@ static int alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base, if (ret < 0) goto err_dealloc_cmap; - fb_info(info, "%s frame buffer device\n", info->fix.id); + printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, + info->fix.id); *rinfo = info; return 0; @@ -745,6 +746,7 @@ static void carminefb_remove(struct pci_dev *dev) iounmap(hw->v_regs); release_mem_region(fix.mmio_start, fix.mmio_len); + pci_set_drvdata(dev, NULL); pci_disable_device(dev); kfree(hw); } |