Skip to content

Commit 4bc73b7

Browse files
committed
Merge tag 'tegra-for-5.16-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes
soc/tegra: Fixes for v5.16-rc6 This contains a single build fix without which ARM allmodconfig builds are broken if -Werror is enabled. * tag 'tegra-for-5.16-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: soc/tegra: fuse: Fix bitwise vs. logical OR warning Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 865ed67 + a708376 commit 4bc73b7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/soc/tegra/fuse/fuse-tegra.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static struct platform_driver tegra_fuse_driver = {
320320
};
321321
builtin_platform_driver(tegra_fuse_driver);
322322

323-
bool __init tegra_fuse_read_spare(unsigned int spare)
323+
u32 __init tegra_fuse_read_spare(unsigned int spare)
324324
{
325325
unsigned int offset = fuse->soc->info->spare + spare * 4;
326326

drivers/soc/tegra/fuse/fuse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ struct tegra_fuse {
6565
void tegra_init_revision(void);
6666
void tegra_init_apbmisc(void);
6767

68-
bool __init tegra_fuse_read_spare(unsigned int spare);
68+
u32 __init tegra_fuse_read_spare(unsigned int spare);
6969
u32 __init tegra_fuse_read_early(unsigned int offset);
7070

7171
u8 tegra_get_major_rev(void);

0 commit comments

Comments
 (0)