From 384b769016d5c1f51d2a6714c32e2dad2c96ed78 Mon Sep 17 00:00:00 2001 From: roel kluin Date: Wed, 26 Nov 2008 22:03:18 -0300 Subject: [PATCH] --- yaml --- r: 125531 b: refs/heads/master c: f347535a6065be6f9e65526fa82c088d68040f42 h: refs/heads/master i: 125529: e9bdde7d3387c5205aae7fb397624ce3a51870ac 125527: 6091f7ad80101fcdb5eb6805cc61fd0d547fe1a2 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-417.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 51791ceb14e3..be4193dc2bbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ed55375919bc30c448c6dd5107e8d593f96856f +refs/heads/master: f347535a6065be6f9e65526fa82c088d68040f42 diff --git a/trunk/drivers/media/video/cx23885/cx23885-417.c b/trunk/drivers/media/video/cx23885/cx23885-417.c index d9888136255d..8f1db57bd1dd 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-417.c +++ b/trunk/drivers/media/video/cx23885/cx23885-417.c @@ -1027,12 +1027,13 @@ static int cx23885_initialize_codec(struct cx23885_dev *dev) printk(KERN_ERR "%s() f/w load failed\n", __func__); return retval; } - dev->cx23417_mailbox = cx23885_find_mailbox(dev); - if (dev->cx23417_mailbox < 0) { + retval = cx23885_find_mailbox(dev); + if (retval < 0) { printk(KERN_ERR "%s() mailbox < 0, error\n", __func__); return -1; } + dev->cx23417_mailbox = retval; retval = cx23885_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0); if (retval < 0) { printk(KERN_ERR