linux-kernel - Re: linux-next: build failure after merge of the final tree (fbdev tree related)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <526E7733.6020509@monstr.eu>
Date:	Mon, 28 Oct 2013 15:39:47 +0100
From:	Michal Simek <monstr@...str.eu>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>,
	Florian Tobias Schandinat <FlorianSchandinat@....de>,
	Tomi Valkeinen <tomi.valkeinen@...com>,
	linux-fbdev@...r.kernel.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Michal Simek <michal.simek@...inx.com>
Subject: Re: linux-next: build failure after merge of the final tree (fbdev
 tree related)

On 10/28/2013 03:23 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
> 
> drivers/video/xilinxfb.c: In function 'xilinxfb_of_probe':
> drivers/video/xilinxfb.c:431:30: error: 'op' undeclared (first use in this function)
> 
> Caused by commit 353846fb8bb7 ("video: xilinxfb: Use standard variable
> name convention") from the fbdev tree.
> 
> I have applied the following fix patch for today:
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Tue, 29 Oct 2013 01:18:22 +1100
> Subject: [PATCH] video: xilinxfb: Fix for "Use standard variable name convention"
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/video/xilinxfb.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
> index 9eedf9673b7f..6ff1a91e9dfd 100644
> --- a/drivers/video/xilinxfb.c
> +++ b/drivers/video/xilinxfb.c
> @@ -428,11 +428,11 @@ static int xilinxfb_of_probe(struct platform_device *pdev)
>  #ifdef CONFIG_PPC_DCR
>  	else {
>  		int start;
> -		start = dcr_resource_start(op->dev.of_node, 0);
> -		drvdata->dcr_len = dcr_resource_len(op->dev.of_node, 0);
> -		drvdata->dcr_host = dcr_map(op->dev.of_node, start, drvdata->dcr_len);
> +		start = dcr_resource_start(pdev->dev.of_node, 0);
> +		drvdata->dcr_len = dcr_resource_len(pdev->dev.of_node, 0);
> +		drvdata->dcr_host = dcr_map(pdev->dev.of_node, start, drvdata->dcr_len);
>  		if (!DCR_MAP_OK(drvdata->dcr_host)) {
> -			dev_err(&op->dev, "invalid DCR address\n");
> +			dev_err(&pdev->dev, "invalid DCR address\n");
>  			return -ENODEV;
>  		}
>  	}
> 

Your fix is correct.

Tested-by: Michal Simek <monstr@...str.eu>

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



Download attachment "signature.asc" of type "application/pgp-signature" (264 bytes)