Re: [PATCH] net: ugg_geth: Fix build error in -next

Guenter Roeck
2014-08-10T17:46:50Z

Grumble. Headline should be s/ugg/ucc, obviously.

Guenter

On 08/10/2014 09:19 AM, Guenter Roeck wrote:
> powerpc:mpc83xx_defconfig and other builds fail with
>
> drivers/net/ethernet/freescale/ucc_geth.c: In function 'ucc_geth_remove':
> drivers/net/ethernet/freescale/ucc_geth.c:3927:19: error:
> 'struct ucc_geth_private' has no member named 'info'
> of_node_put(ugeth->info->tbi_node);
> ^
> drivers/net/ethernet/freescale/ucc_geth.c:3928:19: error:
> 'struct ucc_geth_private' has no member named 'info'
> of_node_put(ugeth->info->phy_node);
> ^
>
> Introduced by commit "net: ucc_geth: drop acquired references in probe error
> path and remove".
>
>>From the context, it appears that the variable is named ug_info.
>
> Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Only seen in -next.
>
> drivers/net/ethernet/freescale/ucc_geth.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
> index d6b64e3..3cf0478 100644
> --- a/drivers/net/ethernet/freescale/ucc_geth.c
> +++ b/drivers/net/ethernet/freescale/ucc_geth.c
> @@ -3924,8 +3924,8 @@ static int ucc_geth_remove(struct platform_device* ofdev)
> unregister_netdev(dev);
> free_netdev(dev);
> ucc_geth_memclean(ugeth);
> - of_node_put(ugeth->info->tbi_node);
> - of_node_put(ugeth->info->phy_node);
> + of_node_put(ugeth->ug_info->tbi_node);
> + of_node_put(ugeth->ug_info->phy_node);
>
> return 0;
> }
>