Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db8df7b0 authored by Harald Welte's avatar Harald Welte Committed by Linus Torvalds
Browse files

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



Signed-off-by: default avatarHarald Welte <HaraldWelte@viatech.com>
Signed-off-by: default avatarFlorian 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2d280f75

drivers/video/via/viafbdev.c

+3 −2
Original line number Diff line number Diff line
@@ -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");