diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 00:40:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 00:40:40 -0400 |
| commit | ae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch) | |
| tree | 9d3cedeb65db521a8436b545bd91641549a18d24 /drivers/ieee1394/nodemgr.c | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'drivers/ieee1394/nodemgr.c')
| -rw-r--r-- | drivers/ieee1394/nodemgr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index a1e30a66297b..83e66ed97ab5 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
| @@ -1005,8 +1005,7 @@ static struct unit_directory *nodemgr_process_unit_directory | |||
| 1005 | return ud; | 1005 | return ud; |
| 1006 | 1006 | ||
| 1007 | unit_directory_error: | 1007 | unit_directory_error: |
| 1008 | if (ud != NULL) | 1008 | kfree(ud); |
| 1009 | kfree(ud); | ||
| 1010 | return NULL; | 1009 | return NULL; |
| 1011 | } | 1010 | } |
| 1012 | 1011 | ||