lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

viafb: pass reference to pci device when calling framebuffer_alloc()

Browse Source 
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>
This commit is contained in:
Harald Welte
2009-09-22 16:47:38 -07:00
committed by Linus Torvalds
parent 2d280f758b
commit db8df7b062
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/video/via/viafbdev.c
View File

@@ -1857,7 +1857,8 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
* variables * variables
*/ */
viafbinfo = framebuffer_alloc(viafb_par_length + viafbinfo = framebuffer_alloc(viafb_par_length +
ALIGN(sizeof(struct viafb_shared), BITS_PER_LONG/8), NULL); ALIGN(sizeof(struct viafb_shared), BITS_PER_LONG/8),
&pdev->dev);
if (!viafbinfo) { if (!viafbinfo) {
printk(KERN_ERR"Could not allocate memory for viafb_info.\n"); printk(KERN_ERR"Could not allocate memory for viafb_info.\n");
return -ENODEV; return -ENODEV;
@@ -1982,7 +1983,7 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
default_var.vsync_len = 4; default_var.vsync_len = 4;
if (viafb_dual_fb) { if (viafb_dual_fb) {
viafbinfo1 = framebuffer_alloc(viafb_par_length, NULL); viafbinfo1 = framebuffer_alloc(viafb_par_length, &pdev->dev);
if (!viafbinfo1) { if (!viafbinfo1) {
printk(KERN_ERR printk(KERN_ERR
"allocate the second framebuffer struct error\n"); "allocate the second framebuffer struct error\n");