Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
This patch includes scripts to create multiple yaml file for different
[kvmfornfv.git]
/
kernel
/
drivers
/
parport
/
procfs.c
diff --git
a/kernel/drivers/parport/procfs.c
b/kernel/drivers/parport/procfs.c
index
3b47080
..
c776333
100644
(file)
--- a/
kernel/drivers/parport/procfs.c
+++ b/
kernel/drivers/parport/procfs.c
@@
-21,6
+21,7
@@
#include <linux/parport.h>
#include <linux/ctype.h>
#include <linux/sysctl.h>
#include <linux/parport.h>
#include <linux/ctype.h>
#include <linux/sysctl.h>
+#include <linux/device.h>
#include <asm/uaccess.h>
#include <asm/uaccess.h>
@@
-558,8
+559,18
@@
int parport_device_proc_unregister(struct pardevice *device)
static int __init parport_default_proc_register(void)
{
static int __init parport_default_proc_register(void)
{
+ int ret;
+
parport_default_sysctl_table.sysctl_header =
register_sysctl_table(parport_default_sysctl_table.dev_dir);
parport_default_sysctl_table.sysctl_header =
register_sysctl_table(parport_default_sysctl_table.dev_dir);
+ if (!parport_default_sysctl_table.sysctl_header)
+ return -ENOMEM;
+ ret = parport_bus_init();
+ if (ret) {
+ unregister_sysctl_table(parport_default_sysctl_table.
+ sysctl_header);
+ return ret;
+ }
return 0;
}
return 0;
}
@@
-570,6
+581,7
@@
static void __exit parport_default_proc_unregister(void)
sysctl_header);
parport_default_sysctl_table.sysctl_header = NULL;
}
sysctl_header);
parport_default_sysctl_table.sysctl_header = NULL;
}
+ parport_bus_exit();
}
#else /* no sysctl or no procfs*/
}
#else /* no sysctl or no procfs*/
@@
-596,11
+608,12
@@
int parport_device_proc_unregister(struct pardevice *device)
static int __init parport_default_proc_register (void)
{
static int __init parport_default_proc_register (void)
{
- return
0
;
+ return
parport_bus_init()
;
}
static void __exit parport_default_proc_unregister (void)
{
}
static void __exit parport_default_proc_unregister (void)
{
+ parport_bus_exit();
}
#endif
}
#endif