From patchwork Fri Jul 2 01:14:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Justin P. Mattock" X-Patchwork-Id: 109789 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o621EfMo025809 for ; Fri, 2 Jul 2010 01:14:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752905Ab0GBBOZ (ORCPT ); Thu, 1 Jul 2010 21:14:25 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:58419 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752570Ab0GBBOZ (ORCPT ); Thu, 1 Jul 2010 21:14:25 -0400 Received: by pvc7 with SMTP id 7so1053054pvc.19 for ; Thu, 01 Jul 2010 18:14:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=8CRK0r3VwvYPk2BRRG+pN2Idawe5X92lLhuvoXW1NqQ=; b=b0m7pn96+RwJqm6l6R41iiy1+gX6wnFOAdPa5tdJXraGpzBrobH373F80wJ8f/qWoM CEWXvOoEPicT/ohN4WppHg9aS0NbKSPVCY1/uZg4fITiAjK+b9U+prnb03s5V1cQxecs FFeknh2xysUvL4+p4YuuqEY0PNneyRRKkTgfw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=E+80JtEW75QbhjxZBCjpj8KO5NFLmuejpaRlCz7ZBd3lYzx8h3y6ctxGMhfCxj7OhO +rBdtWvfxQBgA+i14JNJSLWNeq8Jui94XQ40rveHC2UTb4s6h2oWjQxw3foXimKbELqs 4HpqyTQMGUzAM+Vxydc9HWsnAVVPxVFw6OAeo= Received: by 10.142.215.19 with SMTP id n19mr351235wfg.261.1278033264101; Thu, 01 Jul 2010 18:14:24 -0700 (PDT) Received: from localhost.localdomain ([76.91.45.220]) by mx.google.com with ESMTPS id c23sm84459rvf.0.2010.07.01.18.14.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 01 Jul 2010 18:14:23 -0700 (PDT) From: "Justin P. Mattock" To: linux-acpi@vger.kernel.org Cc: lenb@kernel.org, dhowells@redhat.com, linux-kernel@vger.kernel.org, "Justin P. Mattock" Subject: [PATCH]acpi:glue.c Fix warning: variable 'ret' set but not used Date: Thu, 1 Jul 2010 18:14:21 -0700 Message-Id: <1278033261-2733-1-git-send-email-justinmattock@gmail.com> X-Mailer: git-send-email 1.7.1.rc1.21.gf3bd6 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 02 Jul 2010 01:14:42 +0000 (UTC) diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 4af6301..23b16e6 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -145,6 +145,7 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle) { struct acpi_device *acpi_dev; acpi_status status; + int fn, pn; if (dev->archdata.acpi_handle) { dev_warn(dev, "Drivers changed 'acpi_handle'\n"); @@ -160,12 +161,19 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle) status = acpi_bus_get_device(handle, &acpi_dev); if (!ACPI_FAILURE(status)) { - int ret; - ret = sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj, + fn = sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj, "firmware_node"); - ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj, + pn = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj, "physical_node"); + if (fn || pn) { + dev_warn(&acpi_dev->dev, + "Failed to create link(s) to %s %s:" + " %d\n", + dev_driver_string(dev), dev_name(dev), + fn ?: pn); + return AE_ERROR; + } if (acpi_dev->wakeup.flags.valid) { device_set_wakeup_capable(dev, true); device_set_wakeup_enable(dev,