From patchwork Sat Aug 26 01:52:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jasmin J." X-Patchwork-Id: 9923099 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2D0D6603FF for ; Sat, 26 Aug 2017 01:54:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0192F2858A for ; Sat, 26 Aug 2017 01:54:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA1D82858D; Sat, 26 Aug 2017 01:54:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BDC32858A for ; Sat, 26 Aug 2017 01:54:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751834AbdHZBxG (ORCPT ); Fri, 25 Aug 2017 21:53:06 -0400 Received: from mail.anw.at ([195.234.101.228]:49969 "EHLO mail.anw.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751589AbdHZBxF (ORCPT ); Fri, 25 Aug 2017 21:53:05 -0400 Received: from hoppel.217.196.72.190 (anwhome.anw.at [195.234.103.23]) by mail.anw.at (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id v7Q1r2BA025363; Sat, 26 Aug 2017 03:53:03 +0200 From: "Jasmin J." To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, d.scheller@gmx.net, jasmin@anw.at Subject: [PATCH 2/2] build: Fixed backports/v3.3_eprobe_defer.patch Date: Sat, 26 Aug 2017 03:52:57 +0200 Message-Id: <1503712377-31405-3-git-send-email-jasmin@anw.at> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503712377-31405-1-git-send-email-jasmin@anw.at> References: <1503712377-31405-1-git-send-email-jasmin@anw.at> X-Antivirus: checked in 0.019sec at mail.anw.at ([195.234.102.72]) by smf-clamd v1.2.1 - http://smfs.sf.net/ Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jasmin Jessich Signed-off-by: Jasmin Jessich --- backports/v3.3_eprobe_defer.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/backports/v3.3_eprobe_defer.patch b/backports/v3.3_eprobe_defer.patch index ec949cc..327979d 100644 --- a/backports/v3.3_eprobe_defer.patch +++ b/backports/v3.3_eprobe_defer.patch @@ -10,7 +10,7 @@ index 297e10e69898..0ea394e985c7 100644 struct clk *ccf_clk = clk_get(dev, id); char clk_name[V4L2_CLK_NAME_SIZE]; -@@ -55,17 +56,17 @@ struct v4l2_clk *v4l2_clk_get(struct device *dev, const char *id) +@@ -55,16 +56,16 @@ struct v4l2_clk *v4l2_clk_get(struct device *dev, const char *id) return clk; } @@ -22,8 +22,7 @@ index 297e10e69898..0ea394e985c7 100644 +#if 0 /* if dev_name is not found, try use the OF name to find again */ if (PTR_ERR(clk) == -ENODEV && dev->of_node) { - v4l2_clk_name_of(clk_name, sizeof(clk_name), - of_node_full_name(dev->of_node)); + v4l2_clk_name_of(clk_name, sizeof(clk_name), dev->of_node); clk = v4l2_clk_find(clk_name); } - @@ -31,7 +30,7 @@ index 297e10e69898..0ea394e985c7 100644 if (!IS_ERR(clk)) atomic_inc(&clk->use_count); mutex_unlock(&clk_lock); -@@ -126,8 +127,10 @@ int v4l2_clk_enable(struct v4l2_clk *clk) +@@ -125,8 +126,10 @@ int v4l2_clk_enable(struct v4l2_clk *clk) { int ret; @@ -42,7 +41,7 @@ index 297e10e69898..0ea394e985c7 100644 ret = v4l2_clk_lock_driver(clk); if (ret < 0) -@@ -155,8 +158,10 @@ void v4l2_clk_disable(struct v4l2_clk *clk) +@@ -154,8 +157,10 @@ void v4l2_clk_disable(struct v4l2_clk *clk) { int enable;