aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/isdn/hardware/mISDN/mISDNinfineon.c2
-rw-r--r--drivers/isdn/hisax/l3_1tr6.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index af25e1f3efd4..e90db8870b6c 100644
--- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c
+++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
@@ -563,7 +563,7 @@ reset_inf(struct inf_hw *hw)
563 mdelay(10); 563 mdelay(10);
564 hw->ipac.isac.adf2 = 0x87; 564 hw->ipac.isac.adf2 = 0x87;
565 hw->ipac.hscx[0].slot = 0x1f; 565 hw->ipac.hscx[0].slot = 0x1f;
566 hw->ipac.hscx[0].slot = 0x23; 566 hw->ipac.hscx[1].slot = 0x23;
567 break; 567 break;
568 case INF_GAZEL_R753: 568 case INF_GAZEL_R753:
569 val = inl((u32)hw->cfg.start + GAZEL_CNTRL); 569 val = inl((u32)hw->cfg.start + GAZEL_CNTRL);
diff --git a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c
index b0554f80bfb3..ee4dae1382e0 100644
--- a/drivers/isdn/hisax/l3_1tr6.c
+++ b/drivers/isdn/hisax/l3_1tr6.c
@@ -164,11 +164,9 @@ l3_1tr6_setup(struct l3_process *pc, u_char pr, void *arg)
164 char tmp[80]; 164 char tmp[80];
165 struct sk_buff *skb = arg; 165 struct sk_buff *skb = arg;
166 166
167 p = skb->data;
168
169 /* Channel Identification */ 167 /* Channel Identification */
170 p = skb->data; 168 p = findie(skb->data, skb->len, WE0_chanID, 0);
171 if ((p = findie(p, skb->len, WE0_chanID, 0))) { 169 if (p) {
172 if (p[1] != 1) { 170 if (p[1] != 1) {
173 l3_1tr6_error(pc, "setup wrong chanID len", skb); 171 l3_1tr6_error(pc, "setup wrong chanID len", skb);
174 return; 172 return;