Commit 8c04bcdf authored by Ben Collins's avatar Ben Collins

[ieee1394]: Fix problem with extended ROM regions.

Submitted-by: default avatarSteve Kinneberg <kberg@linux1394.org>
Signed-off-by: default avatarBen Collins <bcollins@debian.org>
parent 0cf472bc
...@@ -251,8 +251,7 @@ static void add_host(struct hpsb_host *host) ...@@ -251,8 +251,7 @@ static void add_host(struct hpsb_host *host)
csr1212_init_local_csr(host->csr.rom, bus_info, host->csr.max_rom); csr1212_init_local_csr(host->csr.rom, bus_info, host->csr.max_rom);
host->csr.rom->max_rom = host->csr.max_rom; static const int mr_map[] = { 4, 64, 1024, 0 };
root = host->csr.rom->root_kv; root = host->csr.rom->root_kv;
if(csr1212_attach_keyval_to_directory(root, node_cap) != CSR1212_SUCCESS) { if(csr1212_attach_keyval_to_directory(root, node_cap) != CSR1212_SUCCESS) {
......
...@@ -206,7 +206,9 @@ struct csr1212_csr *csr1212_create_csr(struct csr1212_bus_ops *ops, ...@@ -206,7 +206,9 @@ struct csr1212_csr *csr1212_create_csr(struct csr1212_bus_ops *ops,
void csr1212_init_local_csr(struct csr1212_csr *csr, void csr1212_init_local_csr(struct csr1212_csr *csr,
const u_int32_t *bus_info_data, int max_rom) const u_int32_t *bus_info_data, int max_rom)
{ {
csr->max_rom = max_rom; static const int mr_map[] = { 4, 64, 1024, 0 };
csr->max_rom = mr_map[max_rom];
memcpy(csr->bus_info_data, bus_info_data, csr->bus_info_len); memcpy(csr->bus_info_data, bus_info_data, csr->bus_info_len);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment