diff options
author | Harald Welte <laforge@gnumonks.org> | 2009-09-22 19:47:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:55 -0400 |
commit | db8df7b0622cc6ddad993da2e4dfaf3b5d98ee30 (patch) | |
tree | 24e24a8afd382857a400f902e0f19ccc22bd2b6c /drivers/video | |
parent | 2d280f758b2044151cb77fdd9c59d1903bbb6a19 (diff) |
viafb: pass reference to pci device when calling framebuffer_alloc()
Signed-off-by: Harald Welte <HaraldWelte@viatech.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/via/viafbdev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index c661ab62c057..56ec696e8afa 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c | |||
@@ -1857,7 +1857,8 @@ static int __devinit via_pci_probe(struct pci_dev *pdev, | |||
1857 | * variables | 1857 | * variables |
1858 | */ | 1858 | */ |
1859 | viafbinfo = framebuffer_alloc(viafb_par_length + | 1859 | viafbinfo = framebuffer_alloc(viafb_par_length + |
1860 | ALIGN(sizeof(struct viafb_shared), BITS_PER_LONG/8), NULL); | 1860 | ALIGN(sizeof(struct viafb_shared), BITS_PER_LONG/8), |
1861 | &pdev->dev); | ||
1861 | if (!viafbinfo) { | 1862 | if (!viafbinfo) { |
1862 | printk(KERN_ERR"Could not allocate memory for viafb_info.\n"); | 1863 | printk(KERN_ERR"Could not allocate memory for viafb_info.\n"); |
1863 | return -ENODEV; | 1864 | return -ENODEV; |
@@ -1982,7 +1983,7 @@ static int __devinit via_pci_probe(struct pci_dev *pdev, | |||
1982 | default_var.vsync_len = 4; | 1983 | default_var.vsync_len = 4; |
1983 | 1984 | ||
1984 | if (viafb_dual_fb) { | 1985 | if (viafb_dual_fb) { |
1985 | viafbinfo1 = framebuffer_alloc(viafb_par_length, NULL); | 1986 | viafbinfo1 = framebuffer_alloc(viafb_par_length, &pdev->dev); |
1986 | if (!viafbinfo1) { | 1987 | if (!viafbinfo1) { |
1987 | printk(KERN_ERR | 1988 | printk(KERN_ERR |
1988 | "allocate the second framebuffer struct error\n"); | 1989 | "allocate the second framebuffer struct error\n"); |