Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

5 files changed, 15 insertions, 13 deletions

diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index f69714a0e9e..b19db20a0be 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -2310,10 +2310,8 @@ static int
 dasd_3990_erp_error_match(struct dasd_ccw_req *cqr1, struct dasd_ccw_req *cqr2)
 {
 
-        /* check failed CCW */
-        if (cqr1->irb.scsw.cpa != cqr2->irb.scsw.cpa) {
-                //      return 0;       /* CCW doesn't match */
-        }
+        if (cqr1->startdev != cqr2->startdev)
+                return 0;
 
         if (cqr1->irb.esw.esw0.erw.cons != cqr2->irb.esw.esw0.erw.cons)
                 return 0;
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 28a86f07004..556063e8f7a 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -62,8 +62,10 @@ dasd_devices_show(struct seq_file *m, void *v)
                 return 0;
         if (device->block)
                 block = device->block;
-        else
+        else {
+                dasd_put_device(device);
                 return 0;
+        }
         /* Print device number. */
         seq_printf(m, "%s", device->cdev->dev.bus_id);
         /* Print discipline string. */
diff --git a/drivers/s390/char/defkeymap.c b/drivers/s390/char/defkeymap.c
index 389346cda6c..07c7f31081b 100644
--- a/drivers/s390/char/defkeymap.c
+++ b/drivers/s390/char/defkeymap.c
@@ -151,8 +151,8 @@ char *func_table[MAX_NR_FUNC] = {
 };
 
 struct kbdiacruc accent_table[MAX_DIACR] = {
-        {'^', 'c', '\003'},     {'^', 'd', '\004'},
-        {'^', 'z', '\032'},     {'^', '\012', '\000'},
+        {'^', 'c', 0003},       {'^', 'd', 0004},
+        {'^', 'z', 0032},       {'^', 0012, 0000},
 };
 
 unsigned int accent_table_size = 4;
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index 92f52720179..f7b258dfd52 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -367,7 +367,7 @@ sclp_vt220_timeout(unsigned long data)
         sclp_vt220_emit_current();
 }
 
-#define BUFFER_MAX_DELAY        HZ/2
+#define BUFFER_MAX_DELAY        HZ/20
 
 /* 
  * Internal implementation of the write function. Write COUNT bytes of data
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index d0c6fd3b1c1..7b0b8190129 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -490,10 +490,12 @@ static int ap_device_probe(struct device *dev)
         int rc;
 
         ap_dev->drv = ap_drv;
-        spin_lock_bh(&ap_device_lock);
-        list_add(&ap_dev->list, &ap_device_list);
-        spin_unlock_bh(&ap_device_lock);
         rc = ap_drv->probe ? ap_drv->probe(ap_dev) : -ENODEV;
+        if (!rc) {
+                spin_lock_bh(&ap_device_lock);
+                list_add(&ap_dev->list, &ap_device_list);
+                spin_unlock_bh(&ap_device_lock);
+        }
         return rc;
 }
 
@@ -532,11 +534,11 @@ static int ap_device_remove(struct device *dev)
 
         ap_flush_queue(ap_dev);
         del_timer_sync(&ap_dev->timeout);
-        if (ap_drv->remove)
-                ap_drv->remove(ap_dev);
         spin_lock_bh(&ap_device_lock);
         list_del_init(&ap_dev->list);
         spin_unlock_bh(&ap_device_lock);
+        if (ap_drv->remove)
+                ap_drv->remove(ap_dev);
         spin_lock_bh(&ap_dev->lock);
         atomic_sub(ap_dev->queue_count, &ap_poll_requests);
         spin_unlock_bh(&ap_dev->lock);