diff options
author | Robert Walsh <rjwalsh@pathscale.com> | 2006-10-10 17:55:45 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2006-10-16 13:06:07 -0400 |
commit | 6ef93dddfe11a72ab98a37ac4ef20ad681b008b0 (patch) | |
tree | 4d8ed1a54364463366a60e9a3352a6361058121e /drivers/infiniband/hw/ipath/ipath_driver.c | |
parent | fb7711e71ea7cd0d3e77e969df59162388c8a1f9 (diff) |
IB/ipath: Initialize diagpkt file on device init only
Don't attempt to set up the diagpkt device in the module init code.
Instead, wait until a piece of hardware is initialized. Fixes a
problem when loading the ib_ipath module when no InfiniPath hardware
is present: modprobe would go into the D state and stay there.
Signed-off-by: Robert Walsh <robert.walsh@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_driver.c')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_driver.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c index 12cefa658f3b..b4ffaa7bcbb7 100644 --- a/drivers/infiniband/hw/ipath/ipath_driver.c +++ b/drivers/infiniband/hw/ipath/ipath_driver.c | |||
@@ -2005,18 +2005,8 @@ static int __init infinipath_init(void) | |||
2005 | goto bail_group; | 2005 | goto bail_group; |
2006 | } | 2006 | } |
2007 | 2007 | ||
2008 | ret = ipath_diagpkt_add(); | ||
2009 | if (ret < 0) { | ||
2010 | printk(KERN_ERR IPATH_DRV_NAME ": Unable to create " | ||
2011 | "diag data device: error %d\n", -ret); | ||
2012 | goto bail_ipathfs; | ||
2013 | } | ||
2014 | |||
2015 | goto bail; | 2008 | goto bail; |
2016 | 2009 | ||
2017 | bail_ipathfs: | ||
2018 | ipath_exit_ipathfs(); | ||
2019 | |||
2020 | bail_group: | 2010 | bail_group: |
2021 | ipath_driver_remove_group(&ipath_driver.driver); | 2011 | ipath_driver_remove_group(&ipath_driver.driver); |
2022 | 2012 | ||