diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
| commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
| tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /fs/char_dev.c | |
| parent | 9bd481f85940726bf66aae5cd03c5b912ad0ae4c (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
Diffstat (limited to 'fs/char_dev.c')
| -rw-r--r-- | fs/char_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index e82aac9cc2f5..a69a5d8a406f 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c | |||
| @@ -150,7 +150,7 @@ __unregister_chrdev_region(unsigned major, unsigned baseminor, int minorct) | |||
| 150 | struct char_device_struct *cd = NULL, **cp; | 150 | struct char_device_struct *cd = NULL, **cp; |
| 151 | int i = major_to_index(major); | 151 | int i = major_to_index(major); |
| 152 | 152 | ||
| 153 | up(&chrdevs_lock); | 153 | down(&chrdevs_lock); |
| 154 | for (cp = &chrdevs[i]; *cp; cp = &(*cp)->next) | 154 | for (cp = &chrdevs[i]; *cp; cp = &(*cp)->next) |
| 155 | if ((*cp)->major == major && | 155 | if ((*cp)->major == major && |
| 156 | (*cp)->baseminor == baseminor && | 156 | (*cp)->baseminor == baseminor && |