diff --git a/[refs] b/[refs] index c0ec01156586..3e74b71b68cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fd9b6cc38028ea64e9a39c6af9d5ad928594be6 +refs/heads/master: b75f2c01de34daf0b25cbd75fcf00511548ffa1e diff --git a/trunk/drivers/video/via/viafbdev.c b/trunk/drivers/video/via/viafbdev.c index 596235b5a5f0..6a7327eaf869 100644 --- a/trunk/drivers/video/via/viafbdev.c +++ b/trunk/drivers/video/via/viafbdev.c @@ -1705,6 +1705,9 @@ int viafb_resume(struct pci_dev *pdev) viaparinfo->shared->saved_regs, 0x100 * sizeof(u32)); + viafb_set_par(viafbinfo); + if (viafb_dual_fb) + viafb_set_par(viafbinfo1); fb_set_suspend(viafbinfo, 0); fail: