From patchwork Sat Mar 7 15:30:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5959451 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C744C9F318 for ; Sat, 7 Mar 2015 15:31:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED408203AE for ; Sat, 7 Mar 2015 15:31:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A4DE203A5 for ; Sat, 7 Mar 2015 15:31:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751846AbbCGPbT (ORCPT ); Sat, 7 Mar 2015 10:31:19 -0500 Received: from mail-wi0-f178.google.com ([209.85.212.178]:42932 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751530AbbCGPa5 (ORCPT ); Sat, 7 Mar 2015 10:30:57 -0500 Received: by widex7 with SMTP id ex7so9338808wid.1; Sat, 07 Mar 2015 07:30:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ckZJQ5qDA73iqR2ZC7Gv7EbYzrE/jVt0IUqCxH23HTg=; b=udekFs7EgMZH9bJu+2nWxV219oQILgTE7flMyZCcCAay+/pt1aze+W2N9rLW240kWt tLLreRFDP5jMOivtOxqHNIkSf4le+nGLGVbjQgFe6pdQ6JcbjIQcu0KaNZiQ8Aa2GWzQ N1x3L3SqvSbEu/3B9Tc/SqHrp27vT8pZismvjhtDANhb3aXYloG8HJBvAE1VJRux6yQM 1qrmJU2euUDZHZWfpuYRmelmTCC7+2Nt9ObGLhmxUi/h9/4k7BFjahDXyFXcwn1Fqbke lZR8e6VzPLwAUY4dreflOgx9huFoqU9DBAMQxRGUC7J6O4IGpHxFQ29djsjV+DiRlwMU kbjw== X-Received: by 10.194.235.71 with SMTP id uk7mr40814920wjc.13.1425742256025; Sat, 07 Mar 2015 07:30:56 -0800 (PST) Received: from tango-charlie.Home (0545247b.skybroadband.com. [5.69.36.123]) by mx.google.com with ESMTPSA id xy2sm5173699wjc.14.2015.03.07.07.30.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 07 Mar 2015 07:30:54 -0800 (PST) From: Lad Prabhakar To: LMML , Hans Verkuil Cc: LKML , "Lad, Prabhakar" Subject: [PATCH 2/2] media: am437x-vpfe: return error in case memory allocation failure Date: Sat, 7 Mar 2015 15:30:50 +0000 Message-Id: <1425742250-24404-3-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1425742250-24404-1-git-send-email-prabhakar.csengg@gmail.com> References: <1425742250-24404-1-git-send-email-prabhakar.csengg@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 From: "Lad, Prabhakar" return error in case devm_kzalloc() fails. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/am437x/am437x-vpfe.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c index 3d59ae0..8e056eb 100644 --- a/drivers/media/platform/am437x/am437x-vpfe.c +++ b/drivers/media/platform/am437x/am437x-vpfe.c @@ -2501,6 +2501,12 @@ vpfe_get_pdata(struct platform_device *pdev) pdata->asd[i] = devm_kzalloc(&pdev->dev, sizeof(struct v4l2_async_subdev), GFP_KERNEL); + if (!pdata->asd[i]) { + of_node_put(rem); + pdata = NULL; + goto done; + } + pdata->asd[i]->match_type = V4L2_ASYNC_MATCH_OF; pdata->asd[i]->match.of.node = rem; of_node_put(rem);