summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/ipath
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-10-26 17:47:52 +0200
committerRoland Dreier <roland@purestorage.com>2011-03-14 22:25:59 +0100
commit2a543904ddcb463db9d56d1efcb2f80884ea55f3 (patch)
tree57cdb9098e4299cc47bb21e8061b671b24d70219 /drivers/infiniband/hw/ipath
parentMerge branch 'for-linus/bugfixes' of git://xenbits.xen.org/people/ianc/linux-2.6 (diff)
downloadlinux-2a543904ddcb463db9d56d1efcb2f80884ea55f3.tar.xz
linux-2a543904ddcb463db9d56d1efcb2f80884ea55f3.zip
IB/ipath: Don't reset disabled devices
The comment some lines above states that disabled devices must not reset. Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Diffstat (limited to 'drivers/infiniband/hw/ipath')
-rw-r--r--drivers/infiniband/hw/ipath/ipath_sysfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/infiniband/hw/ipath/ipath_sysfs.c
index b8cb2f145ae4..8991677e9a08 100644
--- a/drivers/infiniband/hw/ipath/ipath_sysfs.c
+++ b/drivers/infiniband/hw/ipath/ipath_sysfs.c
@@ -557,6 +557,7 @@ static ssize_t store_reset(struct device *dev,
dev_info(dev,"Unit %d is disabled, can't reset\n",
dd->ipath_unit);
ret = -EINVAL;
+ goto bail;
}
ret = ipath_reset_device(dd->ipath_unit);
bail: