From patchwork Mon Mar 22 07:46:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 87371 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2M7jg1i031374 for ; Mon, 22 Mar 2010 07:45:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753948Ab0CVHpm (ORCPT ); Mon, 22 Mar 2010 03:45:42 -0400 Received: from mga09.intel.com ([134.134.136.24]:42764 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753512Ab0CVHpl (ORCPT ); Mon, 22 Mar 2010 03:45:41 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 22 Mar 2010 00:43:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.51,286,1267430400"; d="scan'208";a="606441420" Received: from rzhang1-desktop.sh.intel.com (HELO [10.239.36.107]) ([10.239.36.107]) by orsmga001.jf.intel.com with ESMTP; 22 Mar 2010 00:45:14 -0700 Subject: [PATCH 1/2] ACPI dock: support multiple ACPI dock devices From: Zhang Rui To: "Brown, Len" Cc: "linux-acpi@vger.kernel.org" , "Li, Shaohua" , "Zhang, Rui" Date: Mon, 22 Mar 2010 15:46:49 +0800 Message-ID: <1269244009.2205.1680.camel@rzhang1-desktop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 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]); Mon, 22 Mar 2010 07:45:43 +0000 (UTC) Index: linux-2.6/drivers/acpi/dock.c =================================================================== --- linux-2.6.orig/drivers/acpi/dock.c 2010-03-22 10:19:00.000000000 +0800 +++ linux-2.6/drivers/acpi/dock.c 2010-03-22 10:22:31.000000000 +0800 @@ -1025,13 +1025,10 @@ static acpi_status find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) { - acpi_status status = AE_OK; - if (is_dock(handle)) - if (dock_add(handle) >= 0) - status = AE_CTRL_TERMINATE; + dock_add(handle); - return status; + return AE_OK; } static acpi_status