diff options
author | Thomas Zimmermann <[email protected]> | 2022-07-14 09:57:37 +0200 |
---|---|---|
committer | Thomas Zimmermann <[email protected]> | 2022-07-14 09:57:37 +0200 |
commit | f83d9396d1f63048c423efa00e4e244da10a35fd (patch) | |
tree | 48da2cf9b20cc7049c92dd4a7dd74be11add86e5 /lib/string_helpers.c | |
parent | 5ee8c8f930ba7d20717c4fc2d9f1ce0e757d1155 (diff) | |
parent | 0180290abb5ce5c870f84a00ffeda5802f641dce (diff) |
Merge drm/drm-next into drm-misc-next-fixes
Backmerging from drm/drm-next for the final fixes that will go
into v5.20.
Signed-off-by: Thomas Zimmermann <[email protected]>
Diffstat (limited to 'lib/string_helpers.c')
-rw-r--r-- | lib/string_helpers.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/string_helpers.c b/lib/string_helpers.c index 4f877e9551d5..5ed3beb066e6 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c @@ -757,6 +757,9 @@ char **devm_kasprintf_strarray(struct device *dev, const char *prefix, size_t n) return ERR_PTR(-ENOMEM); } + ptr->n = n; + devres_add(dev, ptr); + return ptr->array; } EXPORT_SYMBOL_GPL(devm_kasprintf_strarray); |