aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-device.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/firewire/fw-device.c')
-rw-r--r--drivers/firewire/fw-device.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index df2e9296ad5b..e8f2dc3151bd 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -145,7 +145,7 @@ fw_unit_uevent(struct device *dev, char **envp, int num_envp,
145 "MODALIAS=%s", modalias)) 145 "MODALIAS=%s", modalias))
146 return -ENOMEM; 146 return -ENOMEM;
147 147
148 out: 148 out:
149 envp[i] = NULL; 149 envp[i] = NULL;
150 150
151 return 0; 151 return 0;
@@ -511,9 +511,9 @@ static void fw_device_init(struct work_struct *work)
511 511
512 return; 512 return;
513 513
514 error_with_device: 514 error_with_device:
515 device_del(&device->device); 515 device_del(&device->device);
516 error: 516 error:
517 cdev_del(&device->cdev); 517 cdev_del(&device->cdev);
518 unregister_chrdev_region(device->device.devt, 1); 518 unregister_chrdev_region(device->device.devt, 1);
519 put_device(&device->device); 519 put_device(&device->device);