Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (23 commits)
  firewire: ohci: extend initialization log message
  firewire: ohci: fix IR/IT context mask mixup
  firewire: ohci: add module parameter to activate quirk fixes
  firewire: ohci: use an ID table for quirks detection
  firewire: ohci: reorder struct fw_ohci for better cache efficiency
  firewire: ohci: remove unused dualbuffer IR code
  firewire: core: combine a bit of repeated code
  firewire: core: change type of a data buffer
  firewire: cdev: increment ABI version number
  firewire: cdev: add more flexible cycle timer ioctl
  firewire: core: rename an internal function
  firewire: core: fix an information leak
  firewire: core: increase stack size of config ROM reader
  firewire: core: don't fail device creation in case of too large config ROM blocks
  firewire: core: fix "giving up on config rom" with Panasonic AG-DV2500
  firewire: remove incomplete Bus_Time CSR support
  firewire: get_cycle_timer optimization and cleanup
  firewire: ohci: enable cycle timer fix on ALi and NEC controllers
  firewire: ohci: work around cycle timer bugs on VIA controllers
  firewire: make PCI device id constant
  ...

1 files changed, 5 insertions, 34 deletions

diff --git a/drivers/media/dvb/firewire/firedtv-fw.c b/drivers/media/dvb/firewire/firedtv-fw.c
index 7a3de16fba06..75afe4f81e33 100644
--- a/drivers/media/dvb/firewire/firedtv-fw.c
+++ b/drivers/media/dvb/firewire/firedtv-fw.c
@@ -239,47 +239,18 @@ static const struct fw_address_region fcp_region = {
 };
 
 /* Adjust the template string if models with longer names appear. */
-#define MAX_MODEL_NAME_LEN ((int)DIV_ROUND_UP(sizeof("FireDTV ????"), 4))
-
-static size_t model_name(u32 *directory, __be32 *buffer)
-{
-        struct fw_csr_iterator ci;
-        int i, length, key, value, last_key = 0;
-        u32 *block = NULL;
-
-        fw_csr_iterator_init(&ci, directory);
-        while (fw_csr_iterator_next(&ci, &key, &value)) {
-                if (last_key == CSR_MODEL &&
-                    key == (CSR_DESCRIPTOR | CSR_LEAF))
-                        block = ci.p - 1 + value;
-                last_key = key;
-        }
-
-        if (block == NULL)
-                return 0;
-
-        length = min((int)(block[0] >> 16) - 2, MAX_MODEL_NAME_LEN);
-        if (length <= 0)
-                return 0;
-
-        /* fast-forward to text string */
-        block += 3;
-
-        for (i = 0; i < length; i++)
-                buffer[i] = cpu_to_be32(block[i]);
-
-        return length * 4;
-}
+#define MAX_MODEL_NAME_LEN sizeof("FireDTV ????")
 
 static int node_probe(struct device *dev)
 {
         struct firedtv *fdtv;
-        __be32 name[MAX_MODEL_NAME_LEN];
+        char name[MAX_MODEL_NAME_LEN];
         int name_len, err;
 
-        name_len = model_name(fw_unit(dev)->directory, name);
+        name_len = fw_csr_string(fw_unit(dev)->directory, CSR_MODEL,
+                                 name, sizeof(name));
 
-        fdtv = fdtv_alloc(dev, &backend, (char *)name, name_len);
+        fdtv = fdtv_alloc(dev, &backend, name, name_len >= 0 ? name_len : 0);
         if (!fdtv)
                 return -ENOMEM;