Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit db8df7b0622cc6ddad993da2e4dfaf3b5d98ee30

Authored by Harald Welte
Committed by Linus Torvalds
1 parent 2d280f758b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

drivers/video/via/viafbdev.c
Diff comments   View file @ db8df7b
... ... @@ -1857,7 +1857,8 @@
1857 1857 * variables
1858 1858 */
1859 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 1862 if (!viafbinfo) {
1862 1863 printk(KERN_ERR"Could not allocate memory for viafb_info.\n");
1863 1864 return -ENODEV;
... ... @@ -1982,7 +1983,7 @@
1982 1983 default_var.vsync_len = 4;
1983 1984  
1984 1985 if (viafb_dual_fb) {
1985   - viafbinfo1 = framebuffer_alloc(viafb_par_length, NULL);
  1986 + viafbinfo1 = framebuffer_alloc(viafb_par_length, &pdev->dev);
1986 1987 if (!viafbinfo1) {
1987 1988 printk(KERN_ERR
1988 1989 "allocate the second framebuffer struct error\n");