Re: [patch] ns558 bug

[Andrew Morton <akpm@osdl.org>]

ambx1@neo.rr.com (Adam Belay) wrote:
>
> On Fri, Feb 04, 2005 at 09:00:54PM +0100, matthieu castet wrote:
>  > Hi,
>  > 
>  > this patch is based on http://bugzilla.kernel.org/show_bug.cgi?id=2962 
>  > patch from adam belay.
>  > 
>  > It solve a oops when pnp_register_driver(&ns558_pnp_driver) failed.
>  > 
>  > Please apply this patch.
>  > 
>  > Matthieu
> 
>  I remember writing a version of this patch a while ago.  The current behavior
>  is broken because it shouldn't be considered a failure if the driver doesn't
>  find any devices.

So would this be the appropriate fix?

--- 25/drivers/input/gameport/ns558.c~ns558-oops-fix	2005-02-04 19:03:11.065813120 -0800
+++ 25-akpm/drivers/input/gameport/ns558.c	2005-02-04 19:05:52.607255088 -0800
@@ -264,6 +264,7 @@ static struct pnp_driver ns558_pnp_drive
 static int __init ns558_init(void)
 {
 	int i = 0;
+	int ret;
 
 /*
  * Probe for ISA ports.
@@ -272,8 +273,8 @@ static int __init ns558_init(void)
 	while (ns558_isa_portlist[i])
 		ns558_isa_probe(ns558_isa_portlist[i++]);
 
-	pnp_register_driver(&ns558_pnp_driver);
-	return list_empty(&ns558_list) ? -ENODEV : 0;
+	ret = pnp_register_driver(&ns558_pnp_driver);
+	return (ret < 0) ? ret : 0;
 }
 
 static void __exit ns558_exit(void)
_