1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 61c4f72644b8..6c0c94c5ef91 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -546,10 +546,12 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
                 if (retval < 0)
                         return retval;
 
-                dev->mailbox = blackbird_find_mailbox(dev);
-                if (dev->mailbox < 0)
+                retval = blackbird_find_mailbox(dev);
+                if (retval < 0)
                         return -1;
 
+                dev->mailbox = retval;
+
                 retval = blackbird_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0); /* ping */
                 if (retval < 0) {
                         dprintk(0, "ERROR: Firmware ping failed!\n");