aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-02-24 13:36:46 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-02-24 13:36:46 +0000
commit5fd9ec85c60f74b100b152c2555ec2f51603f898 (patch)
tree92ee10c505de8ba967c1fa1397aa5840d9dcc3bb
parent86bc1b40c90a42bccb2c50e8cf80df7616924bb2 (diff)
downloadupstream-5fd9ec85c60f74b100b152c2555ec2f51603f898.tar.gz
upstream-5fd9ec85c60f74b100b152c2555ec2f51603f898.tar.bz2
upstream-5fd9ec85c60f74b100b152c2555ec2f51603f898.zip
[package] broadcom-wl: remove an erroneous BUG() call in the glue driver
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30709 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/broadcom-wl/Makefile4
-rw-r--r--package/broadcom-wl/src/glue/wl_glue.c6
2 files changed, 2 insertions, 8 deletions
diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 0439f1f72f..a2bd679d16 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=broadcom-wl
PKG_VERSION:=5.10.56.27.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(ARCH).tar.bz2
PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
diff --git a/package/broadcom-wl/src/glue/wl_glue.c b/package/broadcom-wl/src/glue/wl_glue.c
index 638a65321a..0504232a96 100644
--- a/package/broadcom-wl/src/glue/wl_glue.c
+++ b/package/broadcom-wl/src/glue/wl_glue.c
@@ -235,12 +235,6 @@ struct device * wl_glue_get_dmadev(void *dev)
{
struct device *dma_dev;
- if (!wl_glue_attached)
- {
- BUG();
- return NULL;
- }
-
switch (active_bus_type)
{
#ifdef CONFIG_SSB