From patchwork Wed Apr 13 20:04:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 8828231 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 385E3C0553 for ; Wed, 13 Apr 2016 20:06:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A8FE2037C for ; Wed, 13 Apr 2016 20:06:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51BDB2035D for ; Wed, 13 Apr 2016 20:06:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751735AbcDMUGG (ORCPT ); Wed, 13 Apr 2016 16:06:06 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:45845 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751594AbcDMUGE (ORCPT ); Wed, 13 Apr 2016 16:06:04 -0400 Received: from [187.113.16.13] (helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1aqR35-0003De-Gw; Wed, 13 Apr 2016 20:06:03 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.86_2) (envelope-from ) id 1aqR20-0001L3-Qm; Wed, 13 Apr 2016 17:04:56 -0300 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Mauro Carvalho Chehab , Hans Verkuil , "Lad, Prabhakar" , Julia Lawall , Arnd Bergmann , Sudip Mukherjee , Insu Yun Subject: [PATCH] [media] cx231xx: return proper error codes at cx231xx-417.c Date: Wed, 13 Apr 2016 17:04:51 -0300 Message-Id: X-Mailer: git-send-email 2.5.5 To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of returning -1, return valid error codes. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/usb/cx231xx/cx231xx-417.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c index 3636d8d0abd3..00da024b47a6 100644 --- a/drivers/media/usb/cx231xx/cx231xx-417.c +++ b/drivers/media/usb/cx231xx/cx231xx-417.c @@ -360,7 +360,7 @@ static int wait_for_mci_complete(struct cx231xx *dev) if (count++ > 100) { dprintk(3, "ERROR: Timeout - gpio=%x\n", gpio); - return -1; + return -EIO; } } return 0; @@ -856,7 +856,7 @@ static int cx231xx_find_mailbox(struct cx231xx *dev) } } dprintk(3, "Mailbox signature values not found!\n"); - return -1; + return -EIO; } static void mci_write_memory_to_gpio(struct cx231xx *dev, u32 address, u32 value, @@ -960,14 +960,14 @@ static int cx231xx_load_firmware(struct cx231xx *dev) p_fw = p_current_fw; if (p_current_fw == NULL) { dprintk(2, "FAIL!!!\n"); - return -1; + return -ENOMEM; } p_buffer = vmalloc(4096); if (p_buffer == NULL) { dprintk(2, "FAIL!!!\n"); vfree(p_current_fw); - return -1; + return -ENOMEM; } dprintk(2, "%s()\n", __func__); @@ -992,7 +992,7 @@ static int cx231xx_load_firmware(struct cx231xx *dev) "%s: Error with mc417_register_write\n", __func__); vfree(p_current_fw); vfree(p_buffer); - return -1; + return retval; } retval = request_firmware(&firmware, CX231xx_FIRM_IMAGE_NAME, @@ -1006,7 +1006,7 @@ static int cx231xx_load_firmware(struct cx231xx *dev) "Please fix your hotplug setup, the board will not work without firmware loaded!\n"); vfree(p_current_fw); vfree(p_buffer); - return -1; + return retval; } if (firmware->size != CX231xx_FIRM_IMAGE_SIZE) { @@ -1016,7 +1016,7 @@ static int cx231xx_load_firmware(struct cx231xx *dev) release_firmware(firmware); vfree(p_current_fw); vfree(p_buffer); - return -1; + return -EINVAL; } if (0 != memcmp(firmware->data, magic, 8)) { @@ -1025,7 +1025,7 @@ static int cx231xx_load_firmware(struct cx231xx *dev) release_firmware(firmware); vfree(p_current_fw); vfree(p_buffer); - return -1; + return -EINVAL; } initGPIO(dev); @@ -1140,21 +1140,21 @@ static int cx231xx_initialize_codec(struct cx231xx *dev) if (retval < 0) { dev_err(dev->dev, "%s: mailbox < 0, error\n", __func__); - return -1; + return retval; } dev->cx23417_mailbox = retval; retval = cx231xx_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0); if (retval < 0) { dev_err(dev->dev, "ERROR: cx23417 firmware ping failed!\n"); - return -1; + return retval; } retval = cx231xx_api_cmd(dev, CX2341X_ENC_GET_VERSION, 0, 1, &version); if (retval < 0) { dev_err(dev->dev, "ERROR: cx23417 firmware get encoder: version failed!\n"); - return -1; + return retval; } dprintk(1, "cx23417 firmware version is 0x%08x\n", version); msleep(200);