Re: linux-next: build failure after merge of the drivers-memory tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



09.11.2020 02:23, Stephen Rothwell пишет:
> Hi all,
> 
> After merging the drivers-memory tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/devfreq/tegra20-devfreq.c:18:
> include/soc/tegra/mc.h: In function 'devm_tegra_memory_controller_get':
> include/soc/tegra/mc.h:211:1: error: no return statement in function returning non-void [-Werror=return-type]
>   211 | }
>       | ^
> 
> Caused by commit
> 
>   1f1997eb44b1 ("memory: tegra: Add and use devm_tegra_memory_controller_get()")
> 
> I have added the following fix patch for today:
> 
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Mon, 9 Nov 2020 10:19:44 +1100
> Subject: [PATCH] fix "memory: tegra: Add and use
>  devm_tegra_memory_controller_get()"
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  include/soc/tegra/mc.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h
> index 43876216de34..d731407e23bb 100644
> --- a/include/soc/tegra/mc.h
> +++ b/include/soc/tegra/mc.h
> @@ -207,7 +207,7 @@ struct tegra_mc *devm_tegra_memory_controller_get(struct device *dev);
>  static inline struct tegra_mc *
>  devm_tegra_memory_controller_get(struct device *dev)
>  {
> -	ERR_PTR(-ENODEV);
> +	return ERR_PTR(-ENODEV);
>  }
>  #endif

Krzysztof, will you be able correct this typo locally, or should I add a
new patch?



[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux