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/i740fb.c | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/video/i740fb.c')
| -rw-r--r-- | drivers/video/i740fb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c index ca7c9df..6c48388 100644 --- a/drivers/video/i740fb.c +++ b/drivers/video/i740fb.c @@ -203,7 +203,8 @@ static int i740fb_release(struct fb_info *info, int user) mutex_lock(&(par->open_lock)); if (par->ref_count == 0) { - fb_err(info, "release called with zero refcount\n"); + printk(KERN_ERR "fb%d: release called with zero refcount\n", + info->node); mutex_unlock(&(par->open_lock)); return -EINVAL; } @@ -1066,7 +1067,7 @@ static int i740fb_probe(struct pci_dev *dev, const struct pci_device_id *ent) par->has_sgram = !((tmp & DRAM_RAS_TIMING) || (tmp & DRAM_RAS_PRECHARGE)); - fb_info(info, "Intel740 on %s, %ld KB %s\n", + printk(KERN_INFO "fb%d: Intel740 on %s, %ld KB %s\n", info->node, pci_name(dev), info->screen_size >> 10, par->has_sgram ? "SGRAM" : "SDRAM"); @@ -1142,7 +1143,8 @@ static int i740fb_probe(struct pci_dev *dev, const struct pci_device_id *ent) goto err_reg_framebuffer; } - 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); pci_set_drvdata(dev, info); #ifdef CONFIG_MTRR if (mtrr) { @@ -1192,6 +1194,7 @@ static void i740fb_remove(struct pci_dev *dev) pci_iounmap(dev, info->screen_base); pci_release_regions(dev); /* pci_disable_device(dev); */ + pci_set_drvdata(dev, NULL); framebuffer_release(info); } } |