From patchwork Tue Dec 12 17:49:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scheller X-Patchwork-Id: 10107967 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 B5C0A602C2 for ; Tue, 12 Dec 2017 17:49:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6C1528604 for ; Tue, 12 Dec 2017 17:49:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B79028ECB; Tue, 12 Dec 2017 17:49:07 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 0912B28604 for ; Tue, 12 Dec 2017 17:49:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752467AbdLLRtG (ORCPT ); Tue, 12 Dec 2017 12:49:06 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:38915 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752410AbdLLRtF (ORCPT ); Tue, 12 Dec 2017 12:49:05 -0500 Received: by mail-wm0-f65.google.com with SMTP id i11so301803wmf.4 for ; Tue, 12 Dec 2017 09:49:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=aKdyHJYDU2eos+giY/+FPKzDZsiZFpJtTOwinyA6P5o=; b=DQvJpSqfFwq4OtUlnOuf163tWMQ7ViYWxZYesj2zuSEeBM/e6IC+Z9gTXwxN1Nlzgp Qk0Txha9W3IC1oB1S8ZaaqMDEUyrQ2HCGNfFNBT8U5FM+89JCGoqSrn78HhQmSv+eJNe CRwpwFFgpnqLDzmJ82Hta/0fyDPX/V2c11qgQVBDg+j/LDgkADXm/6rCNsgj2i2siqt2 FQRPMYYszb5JUtfUtrKMoKfVPWSQHW8gyrp+f0wvhaBhHsOOrqxmzpTiC/EeBs05pnr7 AiWC/lQ5niH6euvtSgOG+56MQSiXBgkx67Tiuos7whCiq3joALyobhMosfva7qHqq/PJ j7aQ== 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=aKdyHJYDU2eos+giY/+FPKzDZsiZFpJtTOwinyA6P5o=; b=IT0+dK8He76rIrn7goZl7l/cizY7W2YcJNIZiREvbBzggaxpWXDqWEUjZzkeui7vH3 HLg4foeg+OGHdv3Cb5cdiYuTgWdhe4+QUJHZ2JH8Ye2poaH7haU8Ys6SKVVMx8XOlhMv 9/awUTzX50FWRu70rOVZW8ITcvnB+9Pf1QE/R0ZZlJ8sEx+aIPHaQOIvus6DguPRoAT7 X2TXXqJZfBMWvcsY75Gib4FE+ged/M16L+cVRBy/GoHqIV5FkDnVATqo27HIzJBi+61T Hxf/DNRal7zVkGsN/3RJ6SezpnEA29MvT26jSe5FP6YOqHuyErbOBiL9BMTtveKszy5r i1Hg== X-Gm-Message-State: AKGB3mIBNOzjeuVtHlg+6H3zlT5CkuI8J3D7iIWR2v0scErllFC2Pi+p mkpGYb2Y6H9d12GU4IWIne0CKQ== X-Google-Smtp-Source: ACJfBovE3Jg7t2QGkA3T73ynAekoGAt7hqZy53QIGNIMPd9+bqcTaMKnQtbYg57D4VqKJUzxtoxnMg== X-Received: by 10.28.168.133 with SMTP id r127mr2460682wme.83.1513100943818; Tue, 12 Dec 2017 09:49:03 -0800 (PST) Received: from dvbdev.wuest.de (ip-84-118-193-200.unity-media.net. [84.118.193.200]) by smtp.gmail.com with ESMTPSA id s30sm20824108wrc.89.2017.12.12.09.49.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 09:49:03 -0800 (PST) From: Daniel Scheller To: linux-media@vger.kernel.org, hverkuil@xs4all.nl Cc: jasmin@anw.at Subject: [PATCH] [build] fixup v3.13_ddbridge_pcimsi.patch Date: Tue, 12 Dec 2017 18:49:01 +0100 Message-Id: <20171212174901.14781-1-d.scheller.oss@gmail.com> X-Mailer: git-send-email 2.13.6 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 Required after the ddbridge 0.9.32 bump in media_tree. Signed-off-by: Jasmin Jessich Signed-off-by: Daniel Scheller --- Fixes at least the patch issue with kernel <=3.13. Jasmin originally prepared the updated patch when the ddbridge-0.9.32 bump was done, so sending it in behalf of her (with CONFIG_VIDEO_PVRUSB2 disabled this makes the patch phase work again with older kernels). Hans, this is probably for you. I don't have a fix for the PVRUSB2 usb_urb_ep_type_check() issue at hands though. backports/v3.13_ddbridge_pcimsi.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/backports/v3.13_ddbridge_pcimsi.patch b/backports/v3.13_ddbridge_pcimsi.patch index 5f602a7..f410251 100644 --- a/backports/v3.13_ddbridge_pcimsi.patch +++ b/backports/v3.13_ddbridge_pcimsi.patch @@ -2,7 +2,7 @@ diff --git a/drivers/media/pci/ddbridge/ddbridge-main.c b/drivers/media/pci/ddbr index 9ab4736..50c3b4f 100644 --- a/drivers/media/pci/ddbridge/ddbridge-main.c +++ b/drivers/media/pci/ddbridge/ddbridge-main.c -@@ -129,13 +129,18 @@ static void ddb_irq_msi(struct ddb *dev, int nr) +@@ -129,14 +129,18 @@ static void ddb_irq_msi(struct ddb *dev, int nr) int stat; if (msi && pci_msi_enabled()) { @@ -10,17 +10,18 @@ index 9ab4736..50c3b4f 100644 - if (stat >= 1) { - dev->msi = stat; - dev_info(dev->dev, "using %d MSI interrupt(s)\n", -- dev->msi); -- } else +- dev->msi); +- } else { +- dev_info(dev->dev, "MSI not available.\n"); + stat = pci_enable_msi_block(dev->pdev, nr); + if (stat == 0) { + dev->msi = nr; + } else if (stat == 1) { + stat = pci_enable_msi(dev->pdev); + dev->msi = 1; -+ } + } + if (stat < 0) - dev_info(dev->dev, "MSI not available.\n"); ++ dev_info(dev->dev, "MSI not available.\n"); + else + dev_info(dev->dev, "using %d MSI interrupts\n", + dev->msi);