diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 23:29:34 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 23:29:34 +0200 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /drivers/isdn/hardware | |
| parent | IB/umad: BKL is not needed for ib_umad_open() (diff) | |
| parent | Linux 2.6.26 (diff) | |
| download | linux-2fceef397f9880b212a74c418290ce69e7ac00eb.tar.xz linux-2fceef397f9880b212a74c418290ce69e7ac00eb.zip | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/isdn/hardware')
| -rw-r--r-- | drivers/isdn/hardware/eicon/divasmain.c | 1 | ||||
| -rw-r--r-- | drivers/isdn/hardware/eicon/divasproc.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index 65c95019a9ae..fbbcb27fb681 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c @@ -808,7 +808,6 @@ static int DIVA_INIT_FUNCTION divas_init(void) if (!create_divas_proc()) { #ifdef MODULE - remove_divas_proc(); divas_unregister_chrdev(); divasfunc_exit(); #endif diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c index fae895828a17..040827288ec9 100644 --- a/drivers/isdn/hardware/eicon/divasproc.c +++ b/drivers/isdn/hardware/eicon/divasproc.c @@ -125,8 +125,8 @@ static const struct file_operations divas_fops = { int create_divas_proc(void) { - proc_create(divas_proc_name, S_IFREG | S_IRUGO, proc_net_eicon, - &divas_fops); + divas_proc_entry = proc_create(divas_proc_name, S_IFREG | S_IRUGO, + proc_net_eicon, &divas_fops); if (!divas_proc_entry) return (0); |