diff mbox

[build] fixup v3.13_ddbridge_pcimsi.patch

Message ID 20171212174901.14781-1-d.scheller.oss@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Scheller Dec. 12, 2017, 5:49 p.m. UTC 
From: Jasmin Jessich <jasmin@anw.at>

Required after the ddbridge 0.9.32 bump in media_tree.

Signed-off-by: Jasmin Jessich <jasmin@anw.at>
Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
---
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 mbox

Patch

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);