diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-11-07 12:05:22 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-11-07 12:05:22 -0500 |
| commit | 0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (patch) | |
| tree | 12d292fd58fc0f7a3eb56c89dfc23569f3ab6c00 /fs/devfs | |
| parent | f79b348856fbaf77e4a0c5cb08a808e5879967a9 (diff) | |
| parent | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (diff) | |
Auto-update from upstream
Diffstat (limited to 'fs/devfs')
| -rw-r--r-- | fs/devfs/base.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/devfs/base.c b/fs/devfs/base.c index 8b679b67e5..1274422a53 100644 --- a/fs/devfs/base.c +++ b/fs/devfs/base.c | |||
| @@ -2738,10 +2738,8 @@ static int devfsd_close(struct inode *inode, struct file *file) | |||
| 2738 | entry = fs_info->devfsd_first_event; | 2738 | entry = fs_info->devfsd_first_event; |
| 2739 | fs_info->devfsd_first_event = NULL; | 2739 | fs_info->devfsd_first_event = NULL; |
| 2740 | fs_info->devfsd_last_event = NULL; | 2740 | fs_info->devfsd_last_event = NULL; |
| 2741 | if (fs_info->devfsd_info) { | 2741 | kfree(fs_info->devfsd_info); |
| 2742 | kfree(fs_info->devfsd_info); | 2742 | fs_info->devfsd_info = NULL; |
| 2743 | fs_info->devfsd_info = NULL; | ||
| 2744 | } | ||
| 2745 | spin_unlock(&fs_info->devfsd_buffer_lock); | 2743 | spin_unlock(&fs_info->devfsd_buffer_lock); |
| 2746 | fs_info->devfsd_pgrp = 0; | 2744 | fs_info->devfsd_pgrp = 0; |
| 2747 | fs_info->devfsd_task = NULL; | 2745 | fs_info->devfsd_task = NULL; |