Commit 0df3a3cd authored by James Bottomley's avatar James Bottomley Committed by James Bottomley

update sim710.c for new eisa sysfs registration returns

parent 9efb9d2e
...@@ -328,7 +328,7 @@ struct eisa_driver sim710_eisa_driver = { ...@@ -328,7 +328,7 @@ struct eisa_driver sim710_eisa_driver = {
static int __init sim710_init(void) static int __init sim710_init(void)
{ {
int err = -ENODEV, err2; int err = -ENODEV;
#ifdef MODULE #ifdef MODULE
if (sim710) if (sim710)
...@@ -336,23 +336,17 @@ static int __init sim710_init(void) ...@@ -336,23 +336,17 @@ static int __init sim710_init(void)
#endif #endif
#ifdef CONFIG_MCA #ifdef CONFIG_MCA
if (MCA_bus) err = mca_register_driver(&sim710_mca_driver);
err = mca_register_driver(&sim710_mca_driver);
#endif #endif
#ifdef CONFIG_EISA #ifdef CONFIG_EISA
err2 = eisa_driver_register(&sim710_eisa_driver); err = eisa_driver_register(&sim710_eisa_driver);
/*
* The eise_driver_register return values are strange. I have
* no idea why we don't just use river_register directly anyway..
*/
if (err2 == 1)
err2 = 0;
#endif #endif
/* FIXME: what we'd really like to return here is -ENODEV if
* no devices have actually been found. Instead, the err
* above actually only reports problems with kobject_register,
* so for the moment return success */
if (err < 0 || err2 < 0)
return (err < 0) ? err : err2;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment