diff --git a/[refs] b/[refs]
index e664b7e20f8c..a33707914e1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7be7e93268447cbb42fa0e6939b6372c156a1ad5
+refs/heads/master: 5b999fd04af95e2cb624aaf6a7637561572b2d96
diff --git a/trunk/drivers/isdn/hisax/isurf.c b/trunk/drivers/isdn/hisax/isurf.c
index ea2717215296..c1530fe248c2 100644
--- a/trunk/drivers/isdn/hisax/isurf.c
+++ b/trunk/drivers/isdn/hisax/isurf.c
@@ -231,6 +231,11 @@ setup_isurf(struct IsdnCard *card)
 				}
 				pnp_disable_dev(pnp_d);
 				err = pnp_activate_dev(pnp_d);
+				if (err < 0) {
+					pr_warn("%s: pnp_activate_dev ret=%d\n",
+						__func__, err);
+					return 0;
+				}
 				cs->hw.isurf.reset = pnp_port_start(pnp_d, 0);
 				cs->hw.isurf.phymem = pnp_mem_start(pnp_d, 1);
 				cs->irq = pnp_irq(pnp_d, 0);