From df33e4baa2239f15671155522b713e82e4c792cd Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Fri, 25 Dec 2009 21:47:12 -0300 Subject: [PATCH] --- yaml --- r: 181491 b: refs/heads/master c: b2ad41f9ef72d7b3309a2578bf4432a262ff2b47 h: refs/heads/master i: 181489: 189f640f3319d63ac41777a589aca9a1f6bd43c4 181487: 4a247f261fa435fe0be42441aa49a2eec78bdedd v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/firewire/firedtv-1394.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4aaf422933f1..980251b0d955 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0ecba96e76295792a0b1ee2e03b505562e7b9f3 +refs/heads/master: b2ad41f9ef72d7b3309a2578bf4432a262ff2b47 diff --git a/trunk/drivers/media/dvb/firewire/firedtv-1394.c b/trunk/drivers/media/dvb/firewire/firedtv-1394.c index 7c5459c27b75..81a56293540d 100644 --- a/trunk/drivers/media/dvb/firewire/firedtv-1394.c +++ b/trunk/drivers/media/dvb/firewire/firedtv-1394.c @@ -192,9 +192,13 @@ static int node_probe(struct device *dev) int kv_len, err; void *kv_str; - kv_len = (ud->model_name_kv->value.leaf.len - 2) * sizeof(quadlet_t); - kv_str = CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA(ud->model_name_kv); - + if (ud->model_name_kv) { + kv_len = (ud->model_name_kv->value.leaf.len - 2) * 4; + kv_str = CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA(ud->model_name_kv); + } else { + kv_len = 0; + kv_str = NULL; + } fdtv = fdtv_alloc(dev, &fdtv_1394_backend, kv_str, kv_len); if (!fdtv) return -ENOMEM;