rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix flexcop module register retardo names

This commit is contained in:
Kyle McMartin 2010-09-03 16:46:09 -04:00
parent 7ffcbba219
commit 45fbfae2b4
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flexcop-fix-xlate_proc_name-warning.patch Normal file
View File

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

5
kernel.spec
View File

@ -773,6 +773,7 @@ Patch12500: irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
Patch12510: wireless-extensions-fix-kernel-heap-content-leak.patch
Patch12515: sanity-check-bond-proc_entry.patch
Patch12516: asix-use-eth_mac_addr.patch
Patch12517: flexcop-fix-xlate_proc_name-warning.patch
%endif
@ -1450,6 +1451,9 @@ ApplyPatch sanity-check-bond-proc_entry.patch
# bz #629871
ApplyPatch asix-use-eth_mac_addr.patch
# bz #575873
ApplyPatch flexcop-fix-xlate_proc_name-warning.patch
# END OF PATCH APPLICATIONS
%endif
@ -2075,6 +2079,7 @@ fi
- sanity-check-bond-proc_entry.patch (rhbz#604630)
- asix.c: stub out set_mac_address in case it's breaking things (rhbz#629871)
- default to pci=nocrs
- flexcop: fix registering braindead stupid names (#575873)
* Fri Sep 03 2010 Kyle McMartin <kmcmartin@redhat.com> 2.6.34.6-51
- lirc_imon: move alloc before use (rhbz#629980)