diff options
| author | Karsten Keil <kkeil@linux-pingi.de> | 2012-07-12 07:01:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-18 09:40:54 -0700 |
| commit | 5b999fd04af95e2cb624aaf6a7637561572b2d96 (patch) | |
| tree | 7652915d0d5a8e9e27b1252da1e1c7e8c700a8b7 /drivers/isdn | |
| parent | 7be7e93268447cbb42fa0e6939b6372c156a1ad5 (diff) | |
| download | linux-stable-5b999fd04af95e2cb624aaf6a7637561572b2d96.tar.gz linux-stable-5b999fd04af95e2cb624aaf6a7637561572b2d96.tar.bz2 linux-stable-5b999fd04af95e2cb624aaf6a7637561572b2d96.zip | |
ISDN: Add check for return value of pnp_activate_dev()
pnp_activate_dev() return value needs to be checked to make sure that
following calls calls to the PNP functions do work correctly.
Fix for report #44491 on bugzilla.kernel.org.
Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/hisax/isurf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c index ea2717215296..c1530fe248c2 100644 --- a/drivers/isdn/hisax/isurf.c +++ b/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); |