From patchwork Wed Sep 11 14:07:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 20053 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VJl5U-0002XT-GS; Wed, 11 Sep 2013 16:08:08 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1VJl5O-0002tG-23; Wed, 11 Sep 2013 16:08:05 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753991Ab3IKOIA (ORCPT + 1 other); Wed, 11 Sep 2013 10:08:00 -0400 Received: from mail-bk0-f48.google.com ([209.85.214.48]:35877 "EHLO mail-bk0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752763Ab3IKOIA (ORCPT ); Wed, 11 Sep 2013 10:08:00 -0400 Received: by mail-bk0-f48.google.com with SMTP id my13so3527235bkb.7 for ; Wed, 11 Sep 2013 07:07:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=hZU7rk/W8ZdxPhmm93mpT1vDeA8c6RYaZQG3Pe9WbDQ=; b=nJeMeI7Rp8oxUzWgxws5R2dxfsOtMgibb61lgmESMTNk2kkQPwAjsdYy7loZTdI+ey O89rQgE/SR1mkWVcIcXLlEDEY6mWXEwNjxJqQJ52INAKg0ql64GH+noerTiDfxclK/sI /Z/2fs/k7UPxdC+jYiAtyvLNeRk4ENyqZUqpIhTejnamolKFKtCZ8f36oRJRW8AgmLMA cGvUjZU0ZTJzedX4vLdTKO4lwjk4zBXogLBfDFLPDPlBFjydu7N4gxvkdJuOS14o22y0 lp8XdX4IpxWWm/fZFsyIFASRH8t2zKR1E54jS8PJEllCoxF8ABNER3DYh+KLzcCKsCV7 jmcg== MIME-Version: 1.0 X-Received: by 10.205.10.132 with SMTP id pa4mr1678337bkb.15.1378908478787; Wed, 11 Sep 2013 07:07:58 -0700 (PDT) Received: by 10.205.13.74 with HTTP; Wed, 11 Sep 2013 07:07:58 -0700 (PDT) Date: Wed, 11 Sep 2013 22:07:58 +0800 Message-ID: Subject: [PATCH] [media] adv7511: fix error return code in adv7511_probe() From: Wei Yongjun To: hans.verkuil@cisco.com, m.chehab@samsung.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.9.11.135715 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Wei Yongjun Fix to return -ENOMEM in the new i2c client and create workqueue error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun --- drivers/media/i2c/adv7511.c | 2 ++ 1 file changed, 2 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c index 7a576097..665b0c9 100644 --- a/drivers/media/i2c/adv7511.c +++ b/drivers/media/i2c/adv7511.c @@ -1126,6 +1126,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id * state->i2c_edid = i2c_new_dummy(client->adapter, state->i2c_edid_addr >> 1); if (state->i2c_edid == NULL) { v4l2_err(sd, "failed to register edid i2c client\n"); + err = -ENOMEM; goto err_entity; } @@ -1133,6 +1134,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id * state->work_queue = create_singlethread_workqueue(sd->name); if (state->work_queue == NULL) { v4l2_err(sd, "could not create workqueue\n"); + err = -ENOMEM; goto err_unreg_cec; }