diff options
Diffstat (limited to 'net/atm/resources.c')
-rw-r--r-- | net/atm/resources.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/atm/resources.c b/net/atm/resources.c index 529f7e64aa2c..1bcf6dc8d409 100644 --- a/net/atm/resources.c +++ b/net/atm/resources.c | |||
@@ -142,8 +142,8 @@ void atm_dev_deregister(struct atm_dev *dev) | |||
142 | set_bit(ATM_DF_REMOVED, &dev->flags); | 142 | set_bit(ATM_DF_REMOVED, &dev->flags); |
143 | 143 | ||
144 | /* | 144 | /* |
145 | * if we remove current device from atm_devs list, new device | 145 | * if we remove current device from atm_devs list, new device |
146 | * with same number can appear, such we need deregister proc, | 146 | * with same number can appear, such we need deregister proc, |
147 | * release async all vccs and remove them from vccs list too | 147 | * release async all vccs and remove them from vccs list too |
148 | */ | 148 | */ |
149 | mutex_lock(&atm_dev_mutex); | 149 | mutex_lock(&atm_dev_mutex); |
@@ -228,7 +228,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg) | |||
228 | *tmp_p++ = dev->number; | 228 | *tmp_p++ = dev->number; |
229 | } | 229 | } |
230 | mutex_unlock(&atm_dev_mutex); | 230 | mutex_unlock(&atm_dev_mutex); |
231 | error = ((copy_to_user(buf, tmp_buf, size)) || | 231 | error = ((copy_to_user(buf, tmp_buf, size)) || |
232 | put_user(size, &iobuf->length)) | 232 | put_user(size, &iobuf->length)) |
233 | ? -EFAULT : 0; | 233 | ? -EFAULT : 0; |
234 | kfree(tmp_buf); | 234 | kfree(tmp_buf); |
@@ -247,7 +247,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg) | |||
247 | if (!(dev = try_then_request_module(atm_dev_lookup(number), | 247 | if (!(dev = try_then_request_module(atm_dev_lookup(number), |
248 | "atm-device-%d", number))) | 248 | "atm-device-%d", number))) |
249 | return -ENODEV; | 249 | return -ENODEV; |
250 | 250 | ||
251 | switch (cmd) { | 251 | switch (cmd) { |
252 | case ATM_GETTYPE: | 252 | case ATM_GETTYPE: |
253 | size = strlen(dev->type) + 1; | 253 | size = strlen(dev->type) + 1; |
@@ -390,7 +390,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg) | |||
390 | goto done; | 390 | goto done; |
391 | } | 391 | } |
392 | } | 392 | } |
393 | 393 | ||
394 | if (size) | 394 | if (size) |
395 | error = put_user(size, &sioc->length) | 395 | error = put_user(size, &sioc->length) |
396 | ? -EFAULT : 0; | 396 | ? -EFAULT : 0; |
@@ -414,15 +414,15 @@ static __inline__ void *dev_get_idx(loff_t left) | |||
414 | 414 | ||
415 | void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos) | 415 | void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos) |
416 | { | 416 | { |
417 | mutex_lock(&atm_dev_mutex); | 417 | mutex_lock(&atm_dev_mutex); |
418 | return *pos ? dev_get_idx(*pos) : (void *) 1; | 418 | return *pos ? dev_get_idx(*pos) : (void *) 1; |
419 | } | 419 | } |
420 | 420 | ||
421 | void atm_dev_seq_stop(struct seq_file *seq, void *v) | 421 | void atm_dev_seq_stop(struct seq_file *seq, void *v) |
422 | { | 422 | { |
423 | mutex_unlock(&atm_dev_mutex); | 423 | mutex_unlock(&atm_dev_mutex); |
424 | } | 424 | } |
425 | 425 | ||
426 | void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos) | 426 | void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos) |
427 | { | 427 | { |
428 | ++*pos; | 428 | ++*pos; |