Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755536AbcKVPlG (ORCPT ); Tue, 22 Nov 2016 10:41:06 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34142 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752461AbcKVPlF (ORCPT ); Tue, 22 Nov 2016 10:41:05 -0500 Date: Tue, 22 Nov 2016 16:41:01 +0100 From: Daniel Vetter To: Arnd Bergmann Cc: Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Bjorn Helgaas , Dave Airlie Subject: Re: [PATCH] vgaarb: use valid dev pointer in vgaarb_info() Message-ID: <20161122154101.bxmk2mf5az73p7yg@phenom.ffwll.local> Mail-Followup-To: Arnd Bergmann , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Bjorn Helgaas , Dave Airlie References: <20161122143445.1896558-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161122143445.1896558-1-arnd@arndb.de> X-Operating-System: Linux phenom 4.8.0-1-amd64 User-Agent: NeoMutt/20161104 (1.7.1) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1966 Lines: 60 On Tue, Nov 22, 2016 at 03:34:19PM +0100, Arnd Bergmann wrote: > We now pass the device to the debug messages, but on non-x86, > this is an invalid pointer in vga_arb_device_init: > > drivers/gpu/vga/vgaarb.c: In function 'vga_arb_device_init': > drivers/gpu/vga/vgaarb.c:1467:4: error: 'dev' may be used uninitialized in this function [-Werror=maybe-uninitialized] > > This moves the initialization of the dev pointer outside of the > architecture #ifdef. > > Fixes: a75d68f62106 ("vgaarb: Use dev_printk() when possible") > Signed-off-by: Arnd Bergmann Applied, thx. -Daniel > --- > drivers/gpu/vga/vgaarb.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c > index b3d27182edd9..0f5b2dd24507 100644 > --- a/drivers/gpu/vga/vgaarb.c > +++ b/drivers/gpu/vga/vgaarb.c > @@ -1407,7 +1407,6 @@ static int __init vga_arb_device_init(void) > int rc; > struct pci_dev *pdev; > struct vga_device *vgadev; > - struct device *dev; > > rc = misc_register(&vga_arb_device); > if (rc < 0) > @@ -1424,6 +1423,7 @@ static int __init vga_arb_device_init(void) > vga_arbiter_add_pci_device(pdev); > > list_for_each_entry(vgadev, &vga_list, list) { > + struct device *dev = &vgadev->pdev->dev; > #if defined(CONFIG_X86) || defined(CONFIG_IA64) > /* > * Override vga_arbiter_add_pci_device()'s I/O based detection > @@ -1438,7 +1438,6 @@ static int __init vga_arb_device_init(void) > int i; > > limit = screen_info.lfb_base + screen_info.lfb_size; > - dev = &vgadev->pdev->dev; > > /* Does firmware framebuffer belong to us? */ > for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { > -- > 2.9.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch