diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-02-03 11:55:19 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-03-24 15:56:48 -0400 |
commit | e1eff7a393d4a4e3ad1cf65fcba899146840bfd2 (patch) | |
tree | 88a040babea1853f40072ed199a78b60f4dcb387 /drivers/firewire/fw-iso.c | |
parent | d01b01787680a1156ff6a554e40baa460bb88efb (diff) |
firewire: normalize a variable name
Standardize on if (err)
handle_error;
and if (ret < 0)
handle_error;
Don't call a variable err if we store values in it which mean success.
Also, offset some return statements by a blank line since this how we do
it in drivers/firewire.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-iso.c')
-rw-r--r-- | drivers/firewire/fw-iso.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/firewire/fw-iso.c b/drivers/firewire/fw-iso.c index f511d16efaee..2baf1007253e 100644 --- a/drivers/firewire/fw-iso.c +++ b/drivers/firewire/fw-iso.c | |||
@@ -75,19 +75,21 @@ int fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card, | |||
75 | kfree(buffer->pages); | 75 | kfree(buffer->pages); |
76 | out: | 76 | out: |
77 | buffer->pages = NULL; | 77 | buffer->pages = NULL; |
78 | |||
78 | return -ENOMEM; | 79 | return -ENOMEM; |
79 | } | 80 | } |
80 | 81 | ||
81 | int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma) | 82 | int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma) |
82 | { | 83 | { |
83 | unsigned long uaddr; | 84 | unsigned long uaddr; |
84 | int i, ret; | 85 | int i, err; |
85 | 86 | ||
86 | uaddr = vma->vm_start; | 87 | uaddr = vma->vm_start; |
87 | for (i = 0; i < buffer->page_count; i++) { | 88 | for (i = 0; i < buffer->page_count; i++) { |
88 | ret = vm_insert_page(vma, uaddr, buffer->pages[i]); | 89 | err = vm_insert_page(vma, uaddr, buffer->pages[i]); |
89 | if (ret) | 90 | if (err) |
90 | return ret; | 91 | return err; |
92 | |||
91 | uaddr += PAGE_SIZE; | 93 | uaddr += PAGE_SIZE; |
92 | } | 94 | } |
93 | 95 | ||