diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2015-01-28 21:04:48 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-05 17:09:10 +0100 |
| commit | 476c2ffa138cfe4a8362760ec3b518091ee100e8 (patch) | |
| tree | ebf0860bd2192a2e3cf2cbdc9cd03074400588d3 | |
| parent | b80a514e3c8957a68608825ccbd18ff18420ff1e (diff) | |
| download | linux-476c2ffa138cfe4a8362760ec3b518091ee100e8.tar.gz linux-476c2ffa138cfe4a8362760ec3b518091ee100e8.tar.bz2 linux-476c2ffa138cfe4a8362760ec3b518091ee100e8.zip | |
firewire: core: use correct vendor/model IDs
commit d71e6a11737f4b3d857425a1d6f893231cbd1296 upstream.
The kernel was using the vendor ID 0xd00d1e, which was inherited from
the old ieee1394 driver stack. However, this ID was not registered, and
invalid.
Instead, use the vendor/model IDs that are now officially assigned to
the kernel:
https://ieee1394.wiki.kernel.org/index.php/IEEE_OUI_Assignments
[stefanr:
- The vendor ID 001f11 is Openmoko, Inc.'s identifier, registered at
IEEE Registration Authority.
- The range of model IDs 023900...0239ff are the Linux kernel 1394
subsystem's identifiers, registered at Openmoko.
- Model ID 023901 is picked by the subsystem developers as
firewire-core's model ID.]
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: "Oliver Neukum" <ONeukum@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/firewire/core-transaction.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c index e5af0e3a26ec..d8714808f2c2 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c @@ -1246,14 +1246,14 @@ static const u32 model_textual_descriptor[] = { static struct fw_descriptor vendor_id_descriptor = { .length = ARRAY_SIZE(vendor_textual_descriptor), - .immediate = 0x03d00d1e, + .immediate = 0x03001f11, .key = 0x81000000, .data = vendor_textual_descriptor, }; static struct fw_descriptor model_id_descriptor = { .length = ARRAY_SIZE(model_textual_descriptor), - .immediate = 0x17000001, + .immediate = 0x17023901, .key = 0x81000000, .data = model_textual_descriptor, }; |