diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-16 11:26:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-16 11:26:52 -0700 |
| commit | 205d0494782ff7062afedf8945c085b49ccada7d (patch) | |
| tree | 1def055272108e306ce2b884c66c45f19e708a38 | |
| parent | fd455e77a67690aab2aae885fa0e2e2a9b98bd2b (diff) | |
| parent | 139e08188babf7a4c5f0df54b605105852fc347a (diff) | |
| download | linux-205d0494782ff7062afedf8945c085b49ccada7d.tar.gz | |
Merge tag 'driver-core-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here is a single driver core fix for a much-reported-by-sysbot issue
that showed up in 6.6-rc1. It's been submitted by many people, all in
the same way, so it obviously fixes things for them all.
Also in here is a single documentation update adding riscv to the
embargoed hardware document in case there are any future issues with
that processor family.
Both of these have been in linux-next with no reported problems"
* tag 'driver-core-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
Documentation: embargoed-hardware-issues.rst: Add myself for RISC-V
driver core: return an error when dev_set_name() hasn't happened
| -rw-r--r-- | Documentation/process/embargoed-hardware-issues.rst | 1 | ||||
| -rw-r--r-- | drivers/base/core.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/process/embargoed-hardware-issues.rst b/Documentation/process/embargoed-hardware-issues.rst index cb686238f21d1d..ac7c52f130c9b3 100644 --- a/Documentation/process/embargoed-hardware-issues.rst +++ b/Documentation/process/embargoed-hardware-issues.rst @@ -251,6 +251,7 @@ an involved disclosed party. The current ambassadors list: IBM Z Christian Borntraeger <borntraeger@de.ibm.com> Intel Tony Luck <tony.luck@intel.com> Qualcomm Trilok Soni <tsoni@codeaurora.org> + RISC-V Palmer Dabbelt <palmer@dabbelt.com> Samsung Javier González <javier.gonz@samsung.com> Microsoft James Morris <jamorris@linux.microsoft.com> diff --git a/drivers/base/core.c b/drivers/base/core.c index b7d7f410c2561c..4d8b315c48a15a 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -3537,6 +3537,8 @@ int device_add(struct device *dev) /* subsystems can specify simple device enumeration */ else if (dev->bus && dev->bus->dev_name) error = dev_set_name(dev, "%s%u", dev->bus->dev_name, dev->id); + else + error = -EINVAL; if (error) goto name_error; |