[PATCH 1/2] mISDN.git hfcpci driver - backport from official kernel

Some (rather minor changes) had been made to the hfcpci driver in the official kernel tree,
which are not yet found in the mISDN sources at git.misdn.eu. So get them backported.

Signed-off:	[email protected]


diff -uprN misdn/drivers/isdn/hardware/mISDN/hfcpci.c misdn-new/drivers/isdn/hardware/mISDN/hfcpci.c
--- misdn/drivers/isdn/hardware/mISDN/hfcpci.c	2014-10-12 12:09:06.748370523 +0200
+++ misdn-new/drivers/isdn/hardware/mISDN/hfcpci.c	2014-11-04 22:25:32.302104803 +0100
@@ -490,7 +490,7 @@ receive_dmsg(struct hfc_pci *hc)
  		    (df->data[le16_to_cpu(zp->z1)])) {
  			if (dch->debug & DEBUG_HW)
  				printk(KERN_DEBUG
-				       "empty_fifo hfcpci paket inv. len "
+				       "empty_fifo hfcpci packet inv. len "
  				       "%d or crc %d\n",
  				       rcnt,
  				       df->data[le16_to_cpu(zp->z1)]);
@@ -1307,11 +1307,11 @@ mode_hfcpci(struct bchannel *bch, int bc
  		}
  		if (fifo2 & 2) {
  			hc->hw.fifo_en &= ~HFCPCI_FIFOEN_B2;
-			hc->hw.int_m1 &= ~(HFCPCI_INTS_B2TRANS +
+			hc->hw.int_m1 &= ~(HFCPCI_INTS_B2TRANS |
  					   HFCPCI_INTS_B2REC);
  		} else {
  			hc->hw.fifo_en &= ~HFCPCI_FIFOEN_B1;
-			hc->hw.int_m1 &= ~(HFCPCI_INTS_B1TRANS +
+			hc->hw.int_m1 &= ~(HFCPCI_INTS_B1TRANS |
  					   HFCPCI_INTS_B1REC);
  		}
  #ifdef REVERSE_BITORDER
@@ -1346,14 +1346,14 @@ mode_hfcpci(struct bchannel *bch, int bc
  		if (fifo2 & 2) {
  			hc->hw.fifo_en |= HFCPCI_FIFOEN_B2;
  			if (!tics)
-				hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS +
+				hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS |
  						  HFCPCI_INTS_B2REC);
  			hc->hw.ctmt |= 2;
  			hc->hw.conn &= ~0x18;
  		} else {
  			hc->hw.fifo_en |= HFCPCI_FIFOEN_B1;
  			if (!tics)
-				hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS +
+				hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS |
  						  HFCPCI_INTS_B1REC);
  			hc->hw.ctmt |= 1;
  			hc->hw.conn &= ~0x03;
@@ -1375,14 +1375,14 @@ mode_hfcpci(struct bchannel *bch, int bc
  		if (fifo2 & 2) {
  			hc->hw.last_bfifo_cnt[1] = 0;
  			hc->hw.fifo_en |= HFCPCI_FIFOEN_B2;
-			hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS +
+			hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS |
  					  HFCPCI_INTS_B2REC);
  			hc->hw.ctmt &= ~2;
  			hc->hw.conn &= ~0x18;
  		} else {
  			hc->hw.last_bfifo_cnt[0] = 0;
  			hc->hw.fifo_en |= HFCPCI_FIFOEN_B1;
-			hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS +
+			hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS |
  					  HFCPCI_INTS_B1REC);
  			hc->hw.ctmt &= ~1;
  			hc->hw.conn &= ~0x03;
@@ -2298,8 +2298,8 @@ _hfcpci_softirq(struct device *dev, void
  static void
  hfcpci_softirq(void *arg)
  {
-	(void) driver_for_each_device(&hfc_driver.driver, NULL, arg,
-				      _hfcpci_softirq);
+	WARN_ON_ONCE(driver_for_each_device(&hfc_driver.driver, NULL, arg,
+				      _hfcpci_softirq) != 0);
  
  	/* if next event would be in the past ... */
  	if ((s32)(hfc_jiffies + tics - jiffies) <= 0)