From patchwork Thu Jul 12 17:01:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 170731 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1971A2C021B for ; Fri, 13 Jul 2012 03:01:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934129Ab2GLRBO (ORCPT ); Thu, 12 Jul 2012 13:01:14 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:61042 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934096Ab2GLRBN (ORCPT ); Thu, 12 Jul 2012 13:01:13 -0400 Received: from mailone.linux-pingi.de (p5DC7AB71.dip.t-dialin.net [93.199.171.113]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MK5c9-1Snzqk48bF-001Op8; Thu, 12 Jul 2012 19:01:12 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTPS id 55123B004A for ; Thu, 12 Jul 2012 19:01:09 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 4000) id D4B2D26B; Thu, 12 Jul 2012 19:01:10 +0200 (CEST) From: Karsten Keil To: netdev@vger.kernel.org Subject: [PATCH] ISDN:Add check for return value of pnp_activate_dev() Date: Thu, 12 Jul 2012 19:01:10 +0200 Message-Id: <1342112470-12301-1-git-send-email-kkeil@linux-pingi.de> X-Mailer: git-send-email 1.7.7 X-Provags-ID: V02:K0:3BDCstJqBGMs70aWfxAxMf7hpNLxFUjeIW0a3VPSlAg 2l7wKH2WPfwG38cFZ0f0rjm8t86anSOUQp//2dXNkwep/63LHo G/3Hzno3hD3wsuV8dY5zcxXCid2yYX/sA7phnyRnz47T3lVy47 V6nAm7NQtgkXGK0okV+nDeuu4/uscblci9GCYMR2nFK85+vAto poLJe96LqvuUEAMlD3vUe8TvgGFYkl9caLX9DwA7NPn2ZyW4X/ 8y/9Z0axXzmb08ROLj5nLd57qPR+5jMWjDGq2aaDP5JJ1puRPY wiPLv85/ln25hbctcbdsqqHz7WyKrE/W630kZ69wR2wHhmiLiE //RsG2YW59xm81lAD98XvzkiPO8zWTSxZZ9N9FCSSQ6D6MLWgp 7QhsAYzyaHUYCMxYqItzqHB9wN6KQoqcNo= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 ea27172..c1530fe 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);