1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index d9888136255d..8f1db57bd1dd 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/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