summaryrefslogtreecommitdiff
path: root/drivers/base/regmap/regmap.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2023-10-23 12:32:25 +0300
committerIngo Molnar <mingo@kernel.org>2023-10-23 12:32:25 +0300
commit4e5b65a22ba0cabe58f895cd797cb10a763d6994 (patch)
tree067033eb0d1d284b6ca89c2bfa4034906ff59ad9 /drivers/base/regmap/regmap.c
parent4c456c9ad334a940e354da1002184bc19f4493ef (diff)
parent05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 (diff)
downloadlinux-4e5b65a22ba0cabe58f895cd797cb10a763d6994.tar.xz
Merge tag 'v6.6-rc7' into sched/core, to pick up fixes
Pick up recent sched/urgent fixes merged upstream. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/base/regmap/regmap.c')
-rw-r--r--drivers/base/regmap/regmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 884cb51c8f67..234a84ecde8b 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1478,7 +1478,7 @@ static int dev_get_regmap_match(struct device *dev, void *res, void *data)
/* If the user didn't specify a name match any */
if (data)
- return !strcmp((*r)->name, data);
+ return (*r)->name && !strcmp((*r)->name, data);
else
return 1;
}