diff --git a/[refs] b/[refs]
index 80b38b509b2e..8205c1e08d99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3644c1a2f12b15e1c8bfb9ebfaacbd177011a72d
+refs/heads/master: 0980f2e8144ea0021a09be41176b736d76ca3db7
diff --git a/trunk/drivers/staging/bcm/InterfaceInit.c b/trunk/drivers/staging/bcm/InterfaceInit.c
index dddf34bb7c8b..801ba65e9785 100644
--- a/trunk/drivers/staging/bcm/InterfaceInit.c
+++ b/trunk/drivers/staging/bcm/InterfaceInit.c
@@ -188,7 +188,8 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
 	PS_INTERFACE_ADAPTER psIntfAdapter;
 	struct net_device *ndev;
 
-	ndev = alloc_etherdev_mq(sizeof(MINI_ADAPTER), NO_OF_QUEUES);
+	/* Reserve one extra queue for the bit-bucket */
+	ndev = alloc_etherdev_mq(sizeof(MINI_ADAPTER), NO_OF_QUEUES+1);
 	if(ndev == NULL) {
 		dev_err(&udev->dev, DRV_NAME ": no memory for device\n");
 		return -ENOMEM;
diff --git a/trunk/drivers/staging/bcm/Macros.h b/trunk/drivers/staging/bcm/Macros.h
index 14df2f86b14e..f2fd60286a4c 100644
--- a/trunk/drivers/staging/bcm/Macros.h
+++ b/trunk/drivers/staging/bcm/Macros.h
@@ -261,7 +261,7 @@ typedef enum _E_PHS_DSC_ACTION
 
 #define FIRMWARE_BEGIN_ADDR 0xBFC00000
 
-#define INVALID_QUEUE_INDEX (USHORT)-1
+#define INVALID_QUEUE_INDEX (NO_OF_QUEUES+1)
 
 #define INVALID_PID (pid_t)-1
 #define DDR_80_MHZ  	0