ieee1394: inherit ud vendor_id from node vendor_id
While Module_Vendor_ID in the configuration ROM's root directory is mandatory, there often aren't vendor IDs in unit directories. This affects the new firedtv driver which is meant to be auto-loaded and matched only for vendor-specific devices. We now always copy ne->vendor_id into ud->vendor_id before we scan a unit directory (and fill in a possibly present vendor ID from there). This way, the root directory's vendor ID is used as fallback in the "uevent" environment for modprobe'ing per module alias when a node was plugged in, and in the driver match routine when protocol drivers are bound to unit directories. It will however not be used as sysfs attribute of a unit directory device. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
parent
b33fdd6ca5
commit
9c939e4df4
@ -971,6 +971,9 @@ static struct unit_directory *nodemgr_process_unit_directory
|
||||
ud->ud_kv = ud_kv;
|
||||
ud->id = (*id)++;
|
||||
|
||||
/* inherit vendor_id from root directory if none exists in unit dir */
|
||||
ud->vendor_id = ne->vendor_id;
|
||||
|
||||
csr1212_for_each_dir_entry(ne->csr, kv, ud_kv, dentry) {
|
||||
switch (kv->key.id) {
|
||||
case CSR1212_KV_ID_VENDOR:
|
||||
|
Loading…
Reference in New Issue
Block a user