From patchwork Tue Sep 25 04:20:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 11699 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5ECCA23E53 for ; Tue, 25 Sep 2012 04:23:49 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id EEFABA18666 for ; Tue, 25 Sep 2012 04:23:48 +0000 (UTC) Received: by ieje10 with SMTP id e10so11900453iej.11 for ; Mon, 24 Sep 2012 21:23:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=MpXP9J25/Q/Ekk0Q0rdgYBsHc0RLB3/MITg1rYpBvJ8=; b=FBidFMjklFEUDDn000A0G+k5VHqmTtuuLZVhrU1Dr2guDwllhu16+lHNsM3ldcNNoJ C4D4zrffLYdZ46ajJnpUvNReWCsUjhmVusoXkNB03pDIH9PtTXWNmxdVjBBegcxAFrqW SwxTFTSV/DgC+j/j6uCkXd/hN/ipy6VdKL4Go5mnWkVSQw6KG6ley3/wgruMRXMhKpMK 9cQsND9V9hm8Dbfnjq/RynsGFHEn9to2WaRRzwCEsYul8/y2OupcNY0eBh5xQGE3a3SQ 2CWXUE6xpJE3tVJb6Da9D/P2Il64Bzv+T6UaWEEREHhc9KWJBUhycE46o4fFQO5Ucmdo tVSA== Received: by 10.50.0.193 with SMTP id 1mr7177854igg.0.1348547028304; Mon, 24 Sep 2012 21:23:48 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp275434igc; Mon, 24 Sep 2012 21:23:47 -0700 (PDT) Received: by 10.68.190.8 with SMTP id gm8mr42998792pbc.74.1348547027574; Mon, 24 Sep 2012 21:23:47 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id ts2si21644902pbc.86.2012.09.24.21.23.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 21:23:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by pbcmd12 with SMTP id md12so14553915pbc.37 for ; Mon, 24 Sep 2012 21:23:47 -0700 (PDT) Received: by 10.68.222.37 with SMTP id qj5mr41878033pbc.132.1348547027204; Mon, 24 Sep 2012 21:23:47 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id l10sm9819275pax.32.2012.09.24.21.23.44 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 21:23:46 -0700 (PDT) From: Sachin Kamat To: linux-next@vger.kernel.org Cc: sachin.kamat@linaro.org, patches@linaro.org, Inderpal Singh , Vinod Koul , Stephen Rothwell Subject: [PATCH] DMA: PL330: Fix build error (on linux-next-20120924) Date: Tue, 25 Sep 2012 09:50:00 +0530 Message-Id: <1348546800-15857-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQky5WPJOKC8dpUZyxiHKoiuzSKa9gStY85l5YE/SHwhDOzF0bVGkr7VIvPHC8XMcrAO/1n7 Auto resolution of merge conflict between commits 61c6e753 (DMA: PL330: Check the pointer returned by kzalloc) from Linus tree and 7c71b8eb (DMA: PL330: Remove redundant runtime_suspend/resume functions) from slave-dma tree probably led to this build error. drivers/dma/pl330.c: In function ‘pl330_probe’: drivers/dma/pl330.c:2921:3: error: label ‘probe_err5’ used but not defined Cc: Inderpal Singh Cc: Vinod Koul Cc: Stephen Rothwell Signed-off-by: Sachin Kamat --- drivers/dma/pl330.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index dcb88b0..13cc576 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2918,7 +2918,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) if (!pdmac->peripherals) { ret = -ENOMEM; dev_err(&adev->dev, "unable to allocate pdmac->peripherals\n"); - goto probe_err5; + goto probe_err4; } for (i = 0; i < num_chan; i++) {