From patchwork Fri Aug 31 15:19:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 51818 X-Patchwork-Delegate: sakari.ailus@iki.fi Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvlCf-0000BN-Pm; Fri, 31 Aug 2018 15:19:18 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728503AbeHaT1O (ORCPT + 1 other); Fri, 31 Aug 2018 15:27:14 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33283 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727661AbeHaT1O (ORCPT ); Fri, 31 Aug 2018 15:27:14 -0400 Received: by mail-wr1-f65.google.com with SMTP id v90-v6so11581705wrc.0 for ; Fri, 31 Aug 2018 08:19:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YMd+w6xu6z5E6UfjvFxCMon3HjXziUFla9i/JhUAeyI=; b=b3NXugIrYSg5mLvgWCeBLJ9E8/NEKExcqmXx3RggIcNj4uOPDSwvpsIdovoIMaGQIA FjyA4MH+BLmA9PwuMgdDu/AdXdqRBKVdYUJ486a7pc4+8zfoR3v0L+0Gv+PCFguTXfM4 LtLvkTkZde6e9zK+0zQRnlIFyaJnEqMYHeVmmocQ6Bvocr33cRNBxC11G+XSNdinv1B2 Rgwbu2jp5rAG4Z+DjVB3jjGE+jZLc6r4EeMizRNwgPzqnT1tOA6Ush+VB1uk9CXqS+jj 30eeKhnGtGd28CUfERj4f0PdB0ODjBHXWRAbiy9luNjn+NV2ShRYUc/A0Eg6m2olQL8V /Vvw== X-Gm-Message-State: APzg51BFli7Rg230cc+yjob6VRMbEGJam54f79NJIn+Nn+fqxkzjPTKP 4pSo7saZbmlYoHI1rAMGxjHGiw== X-Google-Smtp-Source: ANB0VdZ9aRhrN6ckmFswpdH1PiAiKOXoqocvGG29uniVqoNZUeuYtKmzNdHqaj1lonMB6EgFpLpTRQ== X-Received: by 2002:adf:82c3:: with SMTP id 61-v6mr11610326wrc.131.1535728754888; Fri, 31 Aug 2018 08:19:14 -0700 (PDT) Received: from minerva.redhat.com ([90.168.169.92]) by smtp.gmail.com with ESMTPSA id q3-v6sm5788904wma.45.2018.08.31.08.19.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 08:19:14 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Sakari Ailus , Javier Martinez Canillas , Mauro Carvalho Chehab , Rui Miguel Silva , linux-media@vger.kernel.org Subject: [PATCH] media: ov2680: register the v4l2 subdev async at the end of probe Date: Fri, 31 Aug 2018 17:19:06 +0200 Message-Id: <20180831151906.9315-1-javierm@redhat.com> X-Mailer: git-send-email 2.17.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The driver registers the subdev async in the middle of the probe function but this has to be done at the very end of the probe function to prevent registering a device whose probe function could fail (i.e: the clock and regulators enable can fail, the I2C transfers could return errors, etc). It could also lead to a media device driver that is waiting to bound the v4l2 subdevice to incorrectly expose its media device to userspace, since the subdev is registered but later its media entity is cleaned up on error. Fixes: 3ee47cad3e69 ("media: ov2680: Add Omnivision OV2680 sensor driver") Signed-off-by: Javier Martinez Canillas --- drivers/media/i2c/ov2680.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c index f753a1c333ef..2ef920a17278 100644 --- a/drivers/media/i2c/ov2680.c +++ b/drivers/media/i2c/ov2680.c @@ -983,10 +983,6 @@ static int ov2680_v4l2_init(struct ov2680_dev *sensor) sensor->sd.ctrl_handler = hdl; - ret = v4l2_async_register_subdev(&sensor->sd); - if (ret < 0) - goto cleanup_entity; - return 0; cleanup_entity: @@ -1096,6 +1092,10 @@ static int ov2680_probe(struct i2c_client *client) if (ret < 0) goto error_cleanup; + ret = v4l2_async_register_subdev(&sensor->sd); + if (ret < 0) + goto error_cleanup; + dev_info(dev, "ov2680 init correctly\n"); return 0; @@ -1104,7 +1104,6 @@ static int ov2680_probe(struct i2c_client *client) dev_err(dev, "ov2680 init fail: %d\n", ret); media_entity_cleanup(&sensor->sd.entity); - v4l2_async_unregister_subdev(&sensor->sd); v4l2_ctrl_handler_free(&sensor->ctrls.handler); lock_destroy: