diff options
author | William Breathitt Gray <vilhelm.gray@gmail.com> | 2016-05-09 09:39:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-17 20:47:11 -0700 |
commit | 5e25db870ec983be138b343a3d04c79a5c1f1703 (patch) | |
tree | a07efd8ec43da7ac714774af61001e3d544adf10 /include/linux/isa.h | |
parent | 32a5a0c047343b11f581f663a2309cf43d13466f (diff) | |
download | linux-stable-5e25db870ec983be138b343a3d04c79a5c1f1703.tar.gz linux-stable-5e25db870ec983be138b343a3d04c79a5c1f1703.tar.bz2 linux-stable-5e25db870ec983be138b343a3d04c79a5c1f1703.zip |
isa: Dummy isa_register_driver should return error code
The inline isa_register_driver stub simply allows compilation on systems
with CONFIG_ISA disabled; the dummy isa_register_driver does not
register an isa_driver at all. The inline isa_register_driver should
return -ENODEV to indicate lack of support when attempting to register
an isa_driver on such a system with CONFIG_ISA disabled.
Cc: Matthew Wilcox <matthew@wil.cx>
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Tested-by: Ye Xiaolong
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/isa.h')
-rw-r--r-- | include/linux/isa.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/isa.h b/include/linux/isa.h index 384ab9b7d79a..f2d0258414cf 100644 --- a/include/linux/isa.h +++ b/include/linux/isa.h @@ -6,6 +6,7 @@ #define __LINUX_ISA_H #include <linux/device.h> +#include <linux/errno.h> #include <linux/kernel.h> struct isa_driver { @@ -28,7 +29,7 @@ void isa_unregister_driver(struct isa_driver *); #else static inline int isa_register_driver(struct isa_driver *d, unsigned int i) { - return 0; + return -ENODEV; } static inline void isa_unregister_driver(struct isa_driver *d) |