diff options
| author |   Petr Mladek <pmladek@suse.com> | 2021-08-30 14:56:06 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-08-30 14:56:06 +0200 |
| commit | 71af75b6929458d85f63c0649dc26d6f4c19729e (patch) | |
| tree | c05c57903424d8270f6b6f3ec3493791fdba4e5c /lib/devres.c | |
| parent | lib/test_scanf: Handle n_bits == 0 in random tests (diff) | |
| parent | printk/index: Fix -Wunused-function warning (diff) | |
| download | wireguard-linux-71af75b6929458d85f63c0649dc26d6f4c19729e.tar.xz wireguard-linux-71af75b6929458d85f63c0649dc26d6f4c19729e.zip | |
Merge branch 'for-5.15-printk-index' into for-linus
Diffstat (limited to 'lib/devres.c')
| -rw-r--r-- | lib/devres.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/devres.c b/lib/devres.c index 4679dbb1bf5f..b0e1c6702c71 100644 --- a/lib/devres.c +++ b/lib/devres.c @@ -157,8 +157,10 @@ __devm_ioremap_resource(struct device *dev, const struct resource *res, dev_name(dev), res->name); else pretty_name = devm_kstrdup(dev, dev_name(dev), GFP_KERNEL); - if (!pretty_name) + if (!pretty_name) { + dev_err(dev, "can't generate pretty name for resource %pR\n", res); return IOMEM_ERR_PTR(-ENOMEM); + } if (!devm_request_mem_region(dev, res->start, size, pretty_name)) { dev_err(dev, "can't request region for resource %pR\n", res); @@ -353,7 +355,7 @@ static void pcim_iomap_release(struct device *gendev, void *res) * detach. * * This function might sleep when the table is first allocated but can - * be safely called without context and guaranteed to succed once + * be safely called without context and guaranteed to succeed once * allocated. */ void __iomem * const *pcim_iomap_table(struct pci_dev *pdev) |