* [PATCH] 2.4 double PCI unregistration with pcigame
@ 2002-12-01 4:40 Herbert Xu
2002-12-01 10:08 ` Vojtech Pavlik
0 siblings, 1 reply; 4+ messages in thread
From: Herbert Xu @ 2002-12-01 4:40 UTC (permalink / raw)
To: vojtech; +Cc: Marcelo Tosatti, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
pcigame.c calls pci_unregister_driver() a second time when it is unloaded
without finding any devices.
--
Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ )
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
[-- Attachment #2: p --]
[-- Type: text/plain, Size: 575 bytes --]
Index: drivers/char/joystick/pcigame.c
===================================================================
RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.4/drivers/char/joystick/pcigame.c,v
retrieving revision 1.1.1.7
diff -u -r1.1.1.7 pcigame.c
--- drivers/char/joystick/pcigame.c 28 Nov 2002 23:53:12 -0000 1.1.1.7
+++ drivers/char/joystick/pcigame.c 1 Dec 2002 02:32:08 -0000
@@ -195,7 +195,7 @@
int __init pcigame_init(void)
{
- pci_module_init(&pcigame_driver);
+ pci_register_driver(&pcigame_driver);
/* Needed by other modules */
return 0;
}
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] 2.4 double PCI unregistration with pcigame
2002-12-01 4:40 [PATCH] 2.4 double PCI unregistration with pcigame Herbert Xu
@ 2002-12-01 10:08 ` Vojtech Pavlik
2002-12-01 10:45 ` Herbert Xu
0 siblings, 1 reply; 4+ messages in thread
From: Vojtech Pavlik @ 2002-12-01 10:08 UTC (permalink / raw)
To: Herbert Xu; +Cc: vojtech, Marcelo Tosatti, Linux Kernel Mailing List
On Sun, Dec 01, 2002 at 03:40:19PM +1100, Herbert Xu wrote:
> pcigame.c calls pci_unregister_driver() a second time when it is unloaded
> without finding any devices.
I think the proper solution would be:
diff -u -r1.1.1.7 pcigame.c
--- drivers/char/joystick/pcigame.c 28 Nov 2002 23:53:12 -0000 1.1.1.7
+++ drivers/char/joystick/pcigame.c 1 Dec 2002 02:32:08 -0000
@@ -195,7 +195,7 @@
int __init pcigame_init(void)
{
- pci_module_init(&pcigame_driver);
- /* Needed by other modules */
- return 0;
+ return pci_module_init(&pcigame_driver);
}
> --
> Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ )
> Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
> Home Page: http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
> Index: drivers/char/joystick/pcigame.c
> ===================================================================
> RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.4/drivers/char/joystick/pcigame.c,v
> retrieving revision 1.1.1.7
> diff -u -r1.1.1.7 pcigame.c
> --- drivers/char/joystick/pcigame.c 28 Nov 2002 23:53:12 -0000 1.1.1.7
> +++ drivers/char/joystick/pcigame.c 1 Dec 2002 02:32:08 -0000
> @@ -195,7 +195,7 @@
>
> int __init pcigame_init(void)
> {
> - pci_module_init(&pcigame_driver);
> + pci_register_driver(&pcigame_driver);
> /* Needed by other modules */
> return 0;
> }
--
Vojtech Pavlik
SuSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] 2.4 double PCI unregistration with pcigame
2002-12-01 10:08 ` Vojtech Pavlik
@ 2002-12-01 10:45 ` Herbert Xu
2002-12-01 10:49 ` Vojtech Pavlik
0 siblings, 1 reply; 4+ messages in thread
From: Herbert Xu @ 2002-12-01 10:45 UTC (permalink / raw)
To: Vojtech Pavlik; +Cc: Marcelo Tosatti, Linux Kernel Mailing List
On Sun, Dec 01, 2002 at 11:08:08AM +0100, Vojtech Pavlik wrote:
>
> I think the proper solution would be:
This wouldn't work since trident.o requires pcigame.o to work even
though the latter may not discover any devices on its own. That's
why that comment is there.
> diff -u -r1.1.1.7 pcigame.c
> --- drivers/char/joystick/pcigame.c 28 Nov 2002 23:53:12 -0000 1.1.1.7
> +++ drivers/char/joystick/pcigame.c 1 Dec 2002 02:32:08 -0000
>
> @@ -195,7 +195,7 @@
>
> int __init pcigame_init(void)
> {
> - pci_module_init(&pcigame_driver);
> - /* Needed by other modules */
> - return 0;
> + return pci_module_init(&pcigame_driver);
> }
--
Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ )
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] 2.4 double PCI unregistration with pcigame
2002-12-01 10:45 ` Herbert Xu
@ 2002-12-01 10:49 ` Vojtech Pavlik
0 siblings, 0 replies; 4+ messages in thread
From: Vojtech Pavlik @ 2002-12-01 10:49 UTC (permalink / raw)
To: Herbert Xu; +Cc: Vojtech Pavlik, Marcelo Tosatti, Linux Kernel Mailing List
On Sun, Dec 01, 2002 at 09:45:02PM +1100, Herbert Xu wrote:
> On Sun, Dec 01, 2002 at 11:08:08AM +0100, Vojtech Pavlik wrote:
> >
> > I think the proper solution would be:
>
> This wouldn't work since trident.o requires pcigame.o to work even
> though the latter may not discover any devices on its own. That's
> why that comment is there.
Ok, I agree. Fortunately this mess isn't in 2.5 ...
> > diff -u -r1.1.1.7 pcigame.c
> > --- drivers/char/joystick/pcigame.c 28 Nov 2002 23:53:12 -0000 1.1.1.7
> > +++ drivers/char/joystick/pcigame.c 1 Dec 2002 02:32:08 -0000
> >
> > @@ -195,7 +195,7 @@
> >
> > int __init pcigame_init(void)
> > {
> > - pci_module_init(&pcigame_driver);
> > - /* Needed by other modules */
> > - return 0;
> > + return pci_module_init(&pcigame_driver);
> > }
> --
> Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ )
> Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
> Home Page: http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
Vojtech Pavlik
SuSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2002-12-01 10:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-12-01 4:40 [PATCH] 2.4 double PCI unregistration with pcigame Herbert Xu
2002-12-01 10:08 ` Vojtech Pavlik
2002-12-01 10:45 ` Herbert Xu
2002-12-01 10:49 ` Vojtech Pavlik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox