Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 151079
b: refs/heads/master
c: cd4a157
h: refs/heads/master
i:
  151077: d54c482
  151075: b04d94b
  151071: 9d76973
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Benjamin Herrenschmidt committed Jun 15, 2009
1 parent c0b2a6f commit 1f141c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 559dc87f50d062d881fed406efb76925aa1f30e7
refs/heads/master: cd4a157d769311964717d5c7cfc0c34426d090b4
6 changes: 3 additions & 3 deletions trunk/drivers/video/ps3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
if (retval < 0)
goto err_fb_dealloc;

dev->core.driver_data = info;
ps3_system_bus_set_drvdata(dev, info);

dev_info(info->device, "%s %s, using %u KiB of video memory\n",
dev_driver_string(info->dev), dev_name(info->dev),
Expand Down Expand Up @@ -1211,7 +1211,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)

static int ps3fb_shutdown(struct ps3_system_bus_device *dev)
{
struct fb_info *info = dev->core.driver_data;
struct fb_info *info = ps3_system_bus_get_drvdata(dev);
u64 xdr_lpar = ps3_mm_phys_to_lpar(__pa(ps3fb_videomemory.address));

dev_dbg(&dev->core, " -> %s:%d\n", __func__, __LINE__);
Expand All @@ -1232,7 +1232,7 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev)
unregister_framebuffer(info);
fb_dealloc_cmap(&info->cmap);
framebuffer_release(info);
info = dev->core.driver_data = NULL;
ps3_system_bus_set_drvdata(dev, NULL);
}
iounmap((u8 __force __iomem *)ps3fb.dinfo);
lv1_gpu_fb_close(ps3fb.context_handle);
Expand Down

0 comments on commit 1f141c8

Please sign in to comment.