aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco/hw.c
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2010-03-11 23:13:28 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-03-15 15:32:06 -0400
commit484b4dd582867c6cfec3a1feb128d60af21c4978 (patch)
tree92abe75edb9fd75f807a501f4bab88ae34b79461 /drivers/net/wireless/orinoco/hw.c
parent1e3f7ac81ef81f25d8d8d902b73d884f97e6aa21 (diff)
downloadkernel_samsung_smdk4412-484b4dd582867c6cfec3a1feb128d60af21c4978.zip
kernel_samsung_smdk4412-484b4dd582867c6cfec3a1feb128d60af21c4978.tar.gz
kernel_samsung_smdk4412-484b4dd582867c6cfec3a1feb128d60af21c4978.tar.bz2
orinoco: disable support for prism chipset by default
The hostap driver provides better support for Prism chipset. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco/hw.c')
-rw-r--r--drivers/net/wireless/orinoco/hw.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/orinoco/hw.c
index e636924..883b8f8 100644
--- a/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@ -262,6 +262,13 @@ int determine_fw_capabilities(struct orinoco_private *priv,
if (fw_name)
dev_info(dev, "Firmware determined as %s\n", fw_name);
+#ifndef CONFIG_HERMES_PRISM
+ if (priv->firmware_type == FIRMWARE_TYPE_INTERSIL) {
+ dev_err(dev, "Support for Prism chipset is not enabled\n");
+ return -ENODEV;
+ }
+#endif
+
return 0;
}