diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 16:20:18 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 16:20:18 -0500 |
| commit | 56012808f4d5606e401539f663d92009d964425b (patch) | |
| tree | f3736a97725647393a2db7c95462d857115197ca /drivers/infiniband | |
| parent | a814290e17ae314bd614476cffc6119846eca27e (diff) | |
| parent | b2a731aa5cbca7e0252da75e16de7ae5feb1313a (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_fs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index b3684060465e..100da8542bba 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/infiniband/hw/ipath/ipath_fs.c | |||
| @@ -346,10 +346,8 @@ static int ipathfs_fill_super(struct super_block *sb, void *data, | |||
| 346 | list_for_each_entry_safe(dd, tmp, &ipath_dev_list, ipath_list) { | 346 | list_for_each_entry_safe(dd, tmp, &ipath_dev_list, ipath_list) { |
| 347 | spin_unlock_irqrestore(&ipath_devs_lock, flags); | 347 | spin_unlock_irqrestore(&ipath_devs_lock, flags); |
| 348 | ret = create_device_files(sb, dd); | 348 | ret = create_device_files(sb, dd); |
| 349 | if (ret) { | 349 | if (ret) |
| 350 | deactivate_locked_super(sb); | ||
| 351 | goto bail; | 350 | goto bail; |
| 352 | } | ||
| 353 | spin_lock_irqsave(&ipath_devs_lock, flags); | 351 | spin_lock_irqsave(&ipath_devs_lock, flags); |
| 354 | } | 352 | } |
| 355 | 353 | ||