From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 06:05:34 +0000 (-0400)
Subject: Merge branch 'ec' into release
X-Git-Tag: Ubuntu-5.13.0-19.19~34316^2~11
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=762caf0baafc657c410b9c04f4a95d4e3aa4dda1;p=mirror_ubuntu-jammy-kernel.git

Merge branch 'ec' into release

Conflicts:
	drivers/acpi/ec.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

762caf0baafc657c410b9c04f4a95d4e3aa4dda1
diff --cc drivers/acpi/ec.c
index f28619d658f7,dc5561809529..08b8cf79946b
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@@ -871,14 -793,7 +827,12 @@@ static int acpi_ec_add(struct acpi_devi
  	acpi_ec_add_fs(device);
  	pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
  			  ec->gpe, ec->command_addr, ec->data_addr);
- 	pr_info(PREFIX "driver started in %s mode\n",
- 		(test_bit(EC_FLAGS_GPE_MODE, &ec->flags))?"interrupt":"poll");
 -	return 0;
 +
 +	ret = ec_install_handlers(ec);
 +
 +	/* EC is fully operational, allow queries */
 +	clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
 +	return ret;
  }
  
  static int acpi_ec_remove(struct acpi_device *device, int type)