From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264044AbTEXL3y (ORCPT ); Sat, 24 May 2003 07:29:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264051AbTEXL3y (ORCPT ); Sat, 24 May 2003 07:29:54 -0400 Received: from dp.samba.org ([66.70.73.150]:48342 "EHLO lists.samba.org") by vger.kernel.org with ESMTP id S264044AbTEXL3x (ORCPT ); Sat, 24 May 2003 07:29:53 -0400 From: Paul Mackerras MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16079.23061.979768.135318@argo.ozlabs.ibm.com> Date: Sat, 24 May 2003 21:40:05 +1000 To: James Simmons Cc: linux-kernel@vger.kernel.org, linux-fbdev-devel@lists.sourceforge.net Subject: [PATCH] fix controlfb and platinumfb drivers X-Mailer: VM 7.15 under Emacs 21.3.2 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org James, This patch fixes the controlfb and platinumfb drivers so that the arguments to fb_set_var are in the correct order. Please apply. Thanks, Paul. diff -urN linux-2.5/drivers/video/controlfb.c pmac-2.5/drivers/video/controlfb.c --- linux-2.5/drivers/video/controlfb.c 2003-04-25 22:19:46.000000000 +1000 +++ pmac-2.5/drivers/video/controlfb.c 2003-05-21 13:32:42.000000000 +1000 @@ -475,7 +475,7 @@ /* Apply default var */ var.activate = FB_ACTIVATE_NOW; - rc = fb_set_var(&var, &p->info); + rc = fb_set_var(&p->info, &var); if (rc && (vmode != VMODE_640_480_60 || cmode != CMODE_8)) goto try_again; diff -urN linux-2.5/drivers/video/platinumfb.c pmac-2.5/drivers/video/platinumfb.c --- linux-2.5/drivers/video/platinumfb.c 2003-04-25 22:19:46.000000000 +1000 +++ pmac-2.5/drivers/video/platinumfb.c 2003-05-21 13:33:01.000000000 +1000 @@ -399,7 +399,7 @@ /* Apply default var */ p->info.var = var; var.activate = FB_ACTIVATE_NOW; - rc = fb_set_var(&var, &p->info); + rc = fb_set_var(&p->info, &var); if (rc && (default_vmode != VMODE_640_480_60 || default_cmode != CMODE_8)) goto try_again;