Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 14 insertions, 16 deletions

diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index 375be509e95f..2a506fe0c8a4 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -67,8 +67,7 @@ static int write_modem(struct cardstate *cs)
         struct sk_buff *skb = bcs->tx_skb;
         int sent = -EOPNOTSUPP;
 
-        if (!tty || !tty->driver || !skb)
-                return -EINVAL;
+        WARN_ON(!tty || !tty->ops || !skb);
 
         if (!skb->len) {
                 dev_kfree_skb_any(skb);
@@ -109,8 +108,7 @@ static int send_cb(struct cardstate *cs)
         unsigned long flags;
         int sent = 0;
 
-        if (!tty || !tty->driver)
-                return -EFAULT;
+        WARN_ON(!tty || !tty->ops);
 
         cb = cs->cmdbuf;
         if (!cb)
@@ -370,19 +368,18 @@ static void gigaset_freecshw(struct cardstate *cs)
         tasklet_kill(&cs->write_tasklet);
         if (!cs->hw.ser)
                 return;
-        dev_set_drvdata(&cs->hw.ser->dev.dev, NULL);
         platform_device_unregister(&cs->hw.ser->dev);
-        kfree(cs->hw.ser);
-        cs->hw.ser = NULL;
 }
 
 static void gigaset_device_release(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
+        struct cardstate *cs = dev_get_drvdata(dev);
 
-        /* adapted from platform_device_release() in drivers/base/platform.c */
-        kfree(dev->platform_data);
-        kfree(pdev->resource);
+        if (!cs)
+                return;
+        dev_set_drvdata(dev, NULL);
+        kfree(cs->hw.ser);
+        cs->hw.ser = NULL;
 }
 
 /*
@@ -432,7 +429,9 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
         struct tty_struct *tty = cs->hw.ser->tty;
         unsigned int set, clear;
 
-        if (!tty || !tty->driver || !tty->ops->tiocmset)
+        WARN_ON(!tty || !tty->ops);
+        /* tiocmset is an optional tty driver method */
+        if (!tty->ops->tiocmset)
                 return -EINVAL;
         set = new_state & ~old_state;
         clear = old_state & ~new_state;
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index a77eea594b69..cb428b9ee441 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -1170,7 +1170,7 @@ mISDNipac_irq(struct ipac_hw *ipac, int maxloop)
 
         if (ipac->type & IPAC_TYPE_IPACX) {
                 ista = ReadIPAC(ipac, ISACX_ISTA);
-                while (ista && cnt--) {
+                while (ista && --cnt) {
                         pr_debug("%s: ISTA %02x\n", ipac->name, ista);
                         if (ista & IPACX__ICA)
                                 ipac_irq(&ipac->hscx[0], ista);
@@ -1182,7 +1182,7 @@ mISDNipac_irq(struct ipac_hw *ipac, int maxloop)
                 }
         } else if (ipac->type & IPAC_TYPE_IPAC) {
                 ista = ReadIPAC(ipac, IPAC_ISTA);
-                while (ista && cnt--) {
+                while (ista && --cnt) {
                         pr_debug("%s: ISTA %02x\n", ipac->name, ista);
                         if (ista & (IPAC__ICD | IPAC__EXD)) {
                                 istad = ReadISAC(isac, ISAC_ISTA);
@@ -1200,7 +1200,7 @@ mISDNipac_irq(struct ipac_hw *ipac, int maxloop)
                         ista = ReadIPAC(ipac, IPAC_ISTA);
                 }
         } else if (ipac->type & IPAC_TYPE_HSCX) {
-                while (cnt) {
+                while (--cnt) {
                         ista = ReadIPAC(ipac, IPAC_ISTAB + ipac->hscx[1].off);
                         pr_debug("%s: B2 ISTA %02x\n", ipac->name, ista);
                         if (ista)
@@ -1211,7 +1211,6 @@ mISDNipac_irq(struct ipac_hw *ipac, int maxloop)
                                 mISDNisac_irq(isac, istad);
                         if (0 == (ista | istad))
                                 break;
-                        cnt--;
                 }
         }
         if (cnt > maxloop) /* only for ISAC/HSCX without PCI IRQ test */