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 " + + 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 cafb93548..6339070d7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -718,6 +718,8 @@ Patch12085: fix-rcu_deref_check-warning.patch # rhbz #513530 Patch12090: dell-wmi-add-support-for-eject-key-studio-1555.patch +Patch12517: flexcop-fix-xlate_proc_name-warning.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1326,6 +1328,9 @@ ApplyPatch fix-rcu_deref_check-warning.patch # bz 513530 ApplyPatch dell-wmi-add-support-for-eject-key-studio-1555.patch +# bz #575873 +ApplyPatch flexcop-fix-xlate_proc_name-warning.patch + # END OF PATCH APPLICATIONS %endif @@ -1915,6 +1920,7 @@ fi * Mon Sep 06 2010 Kyle McMartin - Suck in patch from F-13 to add support for the eject key on the Dell Studio 1555. (#513530) +- flexcop: fix registering braindead stupid names (#575873) * Mon Sep 06 2010 Kyle McMartin - Patch from paulmck to fix rcu_dereference_check warning