summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2010-12-23 11:29:38 -0500
committerKyle McMartin <kyle@redhat.com>2010-12-23 11:29:38 -0500
commit6a82260f5df3ff676f5e261003c1239ffe2cafc3 (patch)
tree3c1c2e3d99495be251e971af47e21a5405830197
parent20f7603f9c530181848316480f98806ce19a5ef7 (diff)
downloadkernel-6a82260f5df3ff676f5e261003c1239ffe2cafc3.tar.gz
kernel-6a82260f5df3ff676f5e261003c1239ffe2cafc3.tar.xz
kernel-6a82260f5df3ff676f5e261003c1239ffe2cafc3.zip
flexcop: fix xlate_proc_name warning through request_irq
-rw-r--r--flexcop-fix-xlate_proc_name-warning.patch30
-rw-r--r--kernel.spec8
2 files changed, 38 insertions, 0 deletions
diff --git a/flexcop-fix-xlate_proc_name-warning.patch b/flexcop-fix-xlate_proc_name-warning.patch
new file mode 100644
index 000000000..82b50a47f
--- /dev/null
+++ b/flexcop-fix-xlate_proc_name-warning.patch
@@ -0,0 +1,30 @@
+diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c
+index 227c020..7465308 100644
+--- a/drivers/media/dvb/b2c2/flexcop-pci.c
++++ b/drivers/media/dvb/b2c2/flexcop-pci.c
+@@ -39,6 +39,7 @@ MODULE_PARM_DESC(debug,
+
+ #define DRIVER_VERSION "0.1"
+ #define DRIVER_NAME "Technisat/B2C2 FlexCop II/IIb/III Digital TV PCI Driver"
++#define FLEXCOP_MODULE_NAME "b2c2-flexcop"
+ #define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@desy.de>"
+
+ struct flexcop_pci {
+@@ -299,7 +300,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci)
+ return ret;
+ pci_set_master(fc_pci->pdev);
+
+- if ((ret = pci_request_regions(fc_pci->pdev, DRIVER_NAME)) != 0)
++ if ((ret = pci_request_regions(fc_pci->pdev, FLEXCOP_MODULE_NAME)) != 0)
+ goto err_pci_disable_device;
+
+ fc_pci->io_mem = pci_iomap(fc_pci->pdev, 0, 0x800);
+@@ -313,7 +314,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci)
+ pci_set_drvdata(fc_pci->pdev, fc_pci);
+ spin_lock_init(&fc_pci->irq_lock);
+ if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr,
+- IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0)
++ IRQF_SHARED, FLEXCOP_MODULE_NAME, fc_pci)) != 0)
+ goto err_pci_iounmap;
+
+ fc_pci->init_state |= FC_PCI_INIT;
diff --git a/kernel.spec b/kernel.spec
index 7c808be91..cff5226bd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -681,6 +681,8 @@ Patch2912: linux-2.6-v4l-dvb-ir-core-update.patch
#Patch2916: lirc-staging-2.6.36-fixes.patch
Patch2917: hdpvr-ir-enable.patch
+Patch2918: flexcop-fix-xlate_proc_name-warning.patch
+
# fs fixes
# NFSv4
@@ -1294,6 +1296,9 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
# enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
ApplyPatch hdpvr-ir-enable.patch
+# rhbz#664852
+ApplyPatch flexcop-fix-xlate_proc_name-warning.patch
+
# Patches headed upstream
ApplyPatch disable-i8042-check-on-apple-mac.patch
@@ -1946,6 +1951,9 @@ fi
# || ||
%changelog
+* Thu Dec 23 2010 Kyle McMartin <kyle@redhat.com>
+- Pull in flexcop procfs rename patch since it's still not upstream. (#664852)
+
* Tue Dec 21 2010 Kyle McMartin <kyle@redhat.com> 2.6.37.0.rc7.git0.2
- Linux 2.6.37-rc7
- CONFIG_USB_OTG=n (seems unnecessary?)