ieee1394: stricter error checks in csr1212

return -EINVAL becomes BUG_ON in checks of function call parameters.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/ieee1394/config_roms.c b/drivers/ieee1394/config_roms.c
index 6a87a2700c9d..556658a1db29 100644
--- a/drivers/ieee1394/config_roms.c
+++ b/drivers/ieee1394/config_roms.c
@@ -63,9 +63,9 @@ int hpsb_default_host_entry(struct hpsb_host *host)
                 return -ENOMEM;
         }
 
-        ret = csr1212_associate_keyval(vend_id, text);
+        csr1212_associate_keyval(vend_id, text);
         csr1212_release_keyval(text);
-        ret |= csr1212_attach_keyval_to_directory(root, vend_id);
+        ret = csr1212_attach_keyval_to_directory(root, vend_id);
         csr1212_release_keyval(vend_id);
         if (ret != CSR1212_SUCCESS) {
                 csr1212_destroy_csr(host->csr.rom);
@@ -103,10 +103,12 @@ static int config_rom_ip1394_init(void)
         if (!ip1394_ud || !spec_id || !spec_desc || !ver || !ver_desc)
                 goto ip1394_fail;
 
-        if (csr1212_associate_keyval(spec_id, spec_desc) == CSR1212_SUCCESS &&
-            csr1212_associate_keyval(ver, ver_desc) == CSR1212_SUCCESS &&
-            csr1212_attach_keyval_to_directory(ip1394_ud, spec_id) == CSR1212_SUCCESS &&
-            csr1212_attach_keyval_to_directory(ip1394_ud, ver) == CSR1212_SUCCESS)
+        csr1212_associate_keyval(spec_id, spec_desc);
+        csr1212_associate_keyval(ver, ver_desc);
+        if (csr1212_attach_keyval_to_directory(ip1394_ud, spec_id)
+                        == CSR1212_SUCCESS &&
+            csr1212_attach_keyval_to_directory(ip1394_ud, ver)
+                        == CSR1212_SUCCESS)
                 ret = 0;
 
 ip1394_fail: