From patchwork Wed Apr 8 11:20:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 459218 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 209DE1401DA for ; Wed, 8 Apr 2015 21:26:12 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=LW1Pjj/G; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753542AbbDHLVU (ORCPT ); Wed, 8 Apr 2015 07:21:20 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:35882 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753332AbbDHLVN (ORCPT ); Wed, 8 Apr 2015 07:21:13 -0400 Received: by pabsx10 with SMTP id sx10so111803217pab.3; Wed, 08 Apr 2015 04:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Z/uvxUIrW8ihFhplSLMQD6THYw8KVxU1wCBFT+QZSHM=; b=LW1Pjj/GOA8BdKQUpDSvJDQiYdjwc+ePtxt1J59Ee4/j1UxJUZlcnEW4ghXLGqihyc VdSp7nEY2q8niMihn0uPM40d8ngNi/rNkH8jNDYF1zK7/BeK4/DjUJ+TfdjzDrnnNwA2 cuGIBYnhGlLA91kITllcKGz0hX1fydqQGO4VxzhAMbwybeJJyQIdm3i1thI7f57R957v XPvLkq/wu7pXP4/pK1aqho79MXK0urPN5VSxJYM0infXrd18VuNrD6PM+3G8GgKHYPKx zphWU2Z0BFFDmTucA8+Jo9JN6MEHONyBDYPlWfwnlYfvFIsOck/yhZqQWsAR+kvwVlnR Z1Xg== X-Received: by 10.66.161.161 with SMTP id xt1mr45508398pab.35.1428492072254; Wed, 08 Apr 2015 04:21:12 -0700 (PDT) Received: from localhost.localdomain ([122.169.147.27]) by mx.google.com with ESMTPSA id og11sm10973411pdb.91.2015.04.08.04.21.06 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Apr 2015 04:21:11 -0700 (PDT) From: Sudip Mukherjee To: Arnd Bergmann , Greg Kroah-Hartman , Jean Delvare , Wolfram Sang , Rodolfo Giometti , "James E.J. Bottomley" , Mark Brown , Willy Tarreau , Jaroslav Kysela , Takashi Iwai Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, netdev@vger.kernel.org, linux-scsi@vger.kernel.org, linux-spi@vger.kernel.org, devel@driverdev.osuosl.org, alsa-devel@alsa-project.org, Sudip Mukherjee Subject: [PATCH 02/14] ALSA: portman2x4: return proper error values from attach Date: Wed, 8 Apr 2015 16:50:28 +0530 Message-Id: <1428492040-5581-3-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1428492040-5581-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1428492040-5581-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org now that we are monitoring the return value from attach, make the required changes to return proper value from its attach function. Signed-off-by: Sudip Mukherjee --- sound/drivers/portman2x4.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index 464385a..866adbb 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c @@ -672,32 +672,37 @@ static int snd_portman_probe_port(struct parport *p) return res ? -EIO : 0; } -static void snd_portman_attach(struct parport *p) +static int snd_portman_attach(struct parport *p) { struct platform_device *device; + int ret; device = platform_device_alloc(PLATFORM_DRIVER, device_count); if (!device) - return; + return -ENOMEM; /* Temporary assignment to forward the parport */ platform_set_drvdata(device, p); - if (platform_device_add(device) < 0) { + ret = platform_device_add(device); + + if (ret < 0) { platform_device_put(device); - return; + return ret; } /* Since we dont get the return value of probe * We need to check if device probing succeeded or not */ if (!platform_get_drvdata(device)) { platform_device_unregister(device); - return; + return -ENODEV; } /* register device in global table */ platform_devices[device_count] = device; device_count++; + + return 0; } static void snd_portman_detach(struct parport *p)