diff --git a/[refs] b/[refs]
index 91faa65aef89..a179a59c2f8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47379052b5c87707bc6e20a2a4f6ac156fb8357c
+refs/heads/master: 33de4f9d787e01646f715ac10c2699fb98fd479e
diff --git a/trunk/drivers/atm/he.c b/trunk/drivers/atm/he.c
index 70667033a568..29e66d603d3c 100644
--- a/trunk/drivers/atm/he.c
+++ b/trunk/drivers/atm/he.c
@@ -921,9 +921,9 @@ he_init_group(struct he_dev *he_dev, int group)
 			he_dev->rbrq_phys);
 	i = CONFIG_RBPL_SIZE;
 out_free_rbpl_virt:
-	while (i--)
-		pci_pool_free(he_dev->rbpl_pool, he_dev->rbpl_virt[i].virt,
-				he_dev->rbpl_base[i].phys);
+	while (--i)
+		pci_pool_free(he_dev->rbps_pool, he_dev->rbpl_virt[i].virt,
+				he_dev->rbps_base[i].phys);
 	kfree(he_dev->rbpl_virt);
 
 out_free_rbpl_base:
@@ -933,11 +933,11 @@ he_init_group(struct he_dev *he_dev, int group)
 out_destroy_rbpl_pool:
 	pci_pool_destroy(he_dev->rbpl_pool);
 
-	i = CONFIG_RBPS_SIZE;
+	i = CONFIG_RBPL_SIZE;
 out_free_rbps_virt:
-	while (i--)
-		pci_pool_free(he_dev->rbps_pool, he_dev->rbps_virt[i].virt,
-				he_dev->rbps_base[i].phys);
+	while (--i)
+		pci_pool_free(he_dev->rbpl_pool, he_dev->rbps_virt[i].virt,
+				he_dev->rbpl_base[i].phys);
 	kfree(he_dev->rbps_virt);
 
 out_free_rbps_base:
diff --git a/trunk/drivers/isdn/hardware/mISDN/Kconfig b/trunk/drivers/isdn/hardware/mISDN/Kconfig
index eadc1cd34a20..bde55d7287fa 100644
--- a/trunk/drivers/isdn/hardware/mISDN/Kconfig
+++ b/trunk/drivers/isdn/hardware/mISDN/Kconfig
@@ -78,7 +78,6 @@ config MISDN_NETJET
 	depends on PCI
 	select MISDN_IPAC
 	select ISDN_HDLC
-	select ISDN_I4L
 	help
 	  Enable support for Traverse Technologies NETJet PCI cards.
 
diff --git a/trunk/drivers/isdn/i4l/Kconfig b/trunk/drivers/isdn/i4l/Kconfig
index 07c4e49f9e77..dd744ffd240b 100644
--- a/trunk/drivers/isdn/i4l/Kconfig
+++ b/trunk/drivers/isdn/i4l/Kconfig
@@ -141,7 +141,8 @@ endmenu
 endif
 
 config ISDN_HDLC
-	tristate
+	tristate 
+	depends on HISAX_ST5481
 	select CRC_CCITT
 	select BITREVERSE
 
diff --git a/trunk/net/ax25/af_ax25.c b/trunk/net/ax25/af_ax25.c
index 4102de1022ee..fbcac76fdc0d 100644
--- a/trunk/net/ax25/af_ax25.c
+++ b/trunk/net/ax25/af_ax25.c
@@ -641,10 +641,15 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,
 
 	case SO_BINDTODEVICE:
 		if (optlen > IFNAMSIZ)
-			optlen = IFNAMSIZ;
-
+			optlen=IFNAMSIZ;
 		if (copy_from_user(devname, optval, optlen)) {
-			res = -EFAULT;
+		res = -EFAULT;
+			break;
+		}
+
+		dev = dev_get_by_name(&init_net, devname);
+		if (dev == NULL) {
+			res = -ENODEV;
 			break;
 		}
 
@@ -652,18 +657,12 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,
 		   (sock->state != SS_UNCONNECTED ||
 		    sk->sk_state == TCP_LISTEN)) {
 			res = -EADDRNOTAVAIL;
-			break;
-		}
-
-		dev = dev_get_by_name(&init_net, devname);
-		if (!dev) {
-			res = -ENODEV;
+			dev_put(dev);
 			break;
 		}
 
 		ax25->ax25_dev = ax25_dev_ax25dev(dev);
 		ax25_fillin_cb(ax25, ax25->ax25_dev);
-		dev_put(dev);
 		break;
 
 	default:
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
index b1b3b0fbf41c..142ebac14176 100644
--- a/trunk/net/bridge/br_if.c
+++ b/trunk/net/bridge/br_if.c
@@ -432,7 +432,6 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 	br_fdb_delete_by_port(br, p, 1);
 err1:
 	kobject_put(&p->kobj);
-	p = NULL; /* kobject_put frees */
 err0:
 	dev_set_promiscuity(dev, -1);
 put_back:
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
index 41e8847508aa..49917a1cac7d 100644
--- a/trunk/net/socket.c
+++ b/trunk/net/socket.c
@@ -2098,17 +2098,12 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
 	unsigned long a[6];
 	unsigned long a0, a1;
 	int err;
-	unsigned int len;
 
 	if (call < 1 || call > SYS_ACCEPT4)
 		return -EINVAL;
 
-	len = nargs[call];
-	if (len > sizeof(a))
-		return -EINVAL;
-
 	/* copy_from_user should be SMP safe. */
-	if (copy_from_user(a, args, len))
+	if (copy_from_user(a, args, nargs[call]))
 		return -EFAULT;
 
 	audit_socketcall(nargs[call] / sizeof(unsigned long), a);
diff --git a/trunk/net/wireless/wext-sme.c b/trunk/net/wireless/wext-sme.c
index bf725275eb8d..53c6ba98dc25 100644
--- a/trunk/net/wireless/wext-sme.c
+++ b/trunk/net/wireless/wext-sme.c
@@ -229,8 +229,7 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev,
 		data->flags = 1;
 		data->length = wdev->wext.connect.ssid_len;
 		memcpy(ssid, wdev->wext.connect.ssid, data->length);
-	} else
-		data->flags = 0;
+	}
 	wdev_unlock(wdev);
 
 	return 0;
@@ -306,8 +305,6 @@ int cfg80211_mgd_wext_giwap(struct net_device *dev,
 	wdev_lock(wdev);
 	if (wdev->current_bss)
 		memcpy(ap_addr->sa_data, wdev->current_bss->pub.bssid, ETH_ALEN);
-	else if (wdev->wext.connect.bssid)
-		memcpy(ap_addr->sa_data, wdev->wext.connect.bssid, ETH_ALEN);
 	else
 		memset(ap_addr->sa_data, 0, ETH_ALEN);
 	wdev_unlock(wdev);