viafb: pass reference to pci device when calling framebuffer_alloc()
Harald Welte [Tue, 22 Sep 2009 23:47:38 +0000 (16:47 -0700)]
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>

drivers/video/via/viafbdev.c

index c661ab6..56ec696 100644 (file)
@@ -1857,7 +1857,8 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
         * variables
        */
        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) {
                printk(KERN_ERR"Could not allocate memory for viafb_info.\n");
                return -ENODEV;
@@ -1982,7 +1983,7 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
        default_var.vsync_len = 4;
 
        if (viafb_dual_fb) {
-               viafbinfo1 = framebuffer_alloc(viafb_par_length, NULL);
+               viafbinfo1 = framebuffer_alloc(viafb_par_length, &pdev->dev);
                if (!viafbinfo1) {
                        printk(KERN_ERR
                        "allocate the second framebuffer struct error\n");