diff options
| author | Stefan Richter | 2009-02-03 17:55:19 +0100 |
|---|---|---|
| committer | Stefan Richter | 2009-03-24 20:56:48 +0100 |
| commit | e1eff7a393d4a4e3ad1cf65fcba899146840bfd2 (patch) | |
| tree | 88a040babea1853f40072ed199a78b60f4dcb387 /drivers/firewire/fw-device.c | |
| parent | firewire: core: remove condition which is always false (diff) | |
| download | kernel-qcow2-linux-e1eff7a393d4a4e3ad1cf65fcba899146840bfd2.tar.gz kernel-qcow2-linux-e1eff7a393d4a4e3ad1cf65fcba899146840bfd2.tar.xz kernel-qcow2-linux-e1eff7a393d4a4e3ad1cf65fcba899146840bfd2.zip | |
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-device.c')
| -rw-r--r-- | drivers/firewire/fw-device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c index df789d321d1b..633e44de5d1a 100644 --- a/drivers/firewire/fw-device.c +++ b/drivers/firewire/fw-device.c @@ -761,7 +761,7 @@ static void fw_device_init(struct work_struct *work) struct fw_device *device = container_of(work, struct fw_device, work.work); struct device *revived_dev; - int minor, err; + int minor, ret; /* * All failure paths here set node->data to NULL, so that we @@ -797,12 +797,12 @@ static void fw_device_init(struct work_struct *work) fw_device_get(device); down_write(&fw_device_rwsem); - err = idr_pre_get(&fw_device_idr, GFP_KERNEL) ? + ret = idr_pre_get(&fw_device_idr, GFP_KERNEL) ? idr_get_new(&fw_device_idr, device, &minor) : -ENOMEM; up_write(&fw_device_rwsem); - if (err < 0) + if (ret < 0) goto error; device->device.bus = &fw_bus_type; |