From: Jasmin Jessich <jasmin@xxxxxx> Signed-off-by: Jasmin Jessich <jasmin@xxxxxx> --- backports/backports.txt | 3 --- backports/v3.13_ddbridge_pcimsi.patch | 29 ----------------------------- 2 files changed, 32 deletions(-) delete mode 100644 backports/v3.13_ddbridge_pcimsi.patch diff --git a/backports/backports.txt b/backports/backports.txt index 78dfb9c..da097ce 100644 --- a/backports/backports.txt +++ b/backports/backports.txt @@ -87,9 +87,6 @@ add v3.16_netdev.patch add v3.16_wait_on_bit.patch add v3.16_void_gpiochip_remove.patch -[3.13.255] -add v3.13_ddbridge_pcimsi.patch - [3.12.255] add v3.12_kfifo_in.patch diff --git a/backports/v3.13_ddbridge_pcimsi.patch b/backports/v3.13_ddbridge_pcimsi.patch deleted file mode 100644 index 5f602a7..0000000 --- a/backports/v3.13_ddbridge_pcimsi.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/drivers/media/pci/ddbridge/ddbridge-main.c b/drivers/media/pci/ddbridge/ddbridge-main.c -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) - int stat; - - if (msi && pci_msi_enabled()) { -- stat = pci_enable_msi_range(dev->pdev, 1, nr); -- if (stat >= 1) { -- dev->msi = stat; -- dev_info(dev->dev, "using %d MSI interrupt(s)\n", -- dev->msi); -- } else -+ 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"); -+ else -+ dev_info(dev->dev, "using %d MSI interrupts\n", -+ dev->msi); - } - } - #endif -- 2.7.4