Date: Thursday, October 11, 2012 @ 01:17:02 Author: tpowa Revision: 168405
remove not needed patches Deleted: linux/trunk/alsa-powersave-3.5.x.patch linux/trunk/i915-i2c-crash-3.5.x.patch linux/trunk/watchdog-3.5.x.patch ----------------------------+ alsa-powersave-3.5.x.patch | 29 -------------------- i915-i2c-crash-3.5.x.patch | 47 --------------------------------- watchdog-3.5.x.patch | 60 ------------------------------------------- 3 files changed, 136 deletions(-) Deleted: alsa-powersave-3.5.x.patch =================================================================== --- alsa-powersave-3.5.x.patch 2012-10-11 00:42:56 UTC (rev 168404) +++ alsa-powersave-3.5.x.patch 2012-10-11 05:17:02 UTC (rev 168405) @@ -1,29 +0,0 @@ -From: Takashi Iwai <ti...@suse.de> -Date: Mon, 20 Aug 2012 19:25:22 +0000 (+0200) -Subject: ALSA: hda - Fix leftover codec->power_transition -X-Git-Tag: v3.6-rc3~14^2~1 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=commitdiff_plain;h=535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 - -ALSA: hda - Fix leftover codec->power_transition - -When the codec turn-on operation is canceled by the immediate -power-on, the driver left the power_transition flag as is. -This caused the persistent avoidance of power-save behavior. - -Cc: <sta...@vger.kernel.org> [v3.5+] -Signed-off-by: Takashi Iwai <ti...@suse.de> ---- - -diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c -index c3077d5..f560051 100644 ---- a/sound/pci/hda/hda_codec.c -+++ b/sound/pci/hda/hda_codec.c -@@ -4454,6 +4454,8 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down) - * then there is no need to go through power up here. - */ - if (codec->power_on) { -+ if (codec->power_transition < 0) -+ codec->power_transition = 0; - spin_unlock(&codec->power_lock); - return; - } Deleted: i915-i2c-crash-3.5.x.patch =================================================================== --- i915-i2c-crash-3.5.x.patch 2012-10-11 00:42:56 UTC (rev 168404) +++ i915-i2c-crash-3.5.x.patch 2012-10-11 05:17:02 UTC (rev 168405) @@ -1,47 +0,0 @@ -From cee25168e9c4ef7f9417632af2dc78b8521dfda7 Mon Sep 17 00:00:00 2001 -From: Jani Nikula <jani.nik...@intel.com> -Date: Mon, 13 Aug 2012 17:33:02 +0300 -Subject: [PATCH] drm/i915: ensure i2c adapter is all set before adding it - -i2c_add_adapter() may do i2c transfers on the bus to detect supported -devices. Therefore the adapter needs to be all set before adding it. This -was not the case for the bit-banging fallback, resulting in an oops if the -device detection GMBUS transfers timed out. Fix the issue by calling -i2c_add_adapter() only after intel_gpio_setup(). - -LKML-Reference: <5021f00b.7000...@ionic.de> -Tested-by: Mihai Moldovan <io...@ionic.de> -Signed-off-by: Jani Nikula <jani.nik...@intel.com> -Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch> ---- - drivers/gpu/drm/i915/intel_i2c.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c -index d79500b..b9755f6 100644 ---- a/drivers/gpu/drm/i915/intel_i2c.c -+++ b/drivers/gpu/drm/i915/intel_i2c.c -@@ -486,9 +486,6 @@ int intel_setup_gmbus(struct drm_device *dev) - bus->dev_priv = dev_priv; - - bus->adapter.algo = &gmbus_algorithm; -- ret = i2c_add_adapter(&bus->adapter); -- if (ret) -- goto err; - - /* By default use a conservative clock rate */ - bus->reg0 = port | GMBUS_RATE_100KHZ; -@@ -498,6 +495,10 @@ int intel_setup_gmbus(struct drm_device *dev) - bus->force_bit = true; - - intel_gpio_setup(bus, port); -+ -+ ret = i2c_add_adapter(&bus->adapter); -+ if (ret) -+ goto err; - } - - intel_i2c_reset(dev_priv->dev); --- -1.7.7.6 - Deleted: watchdog-3.5.x.patch =================================================================== --- watchdog-3.5.x.patch 2012-10-11 00:42:56 UTC (rev 168404) +++ watchdog-3.5.x.patch 2012-10-11 05:17:02 UTC (rev 168405) @@ -1,60 +0,0 @@ -diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c -index 027cc8f..a05fdfc 100644 ---- a/drivers/mfd/lpc_ich.c -+++ b/drivers/mfd/lpc_ich.c -@@ -765,7 +765,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, - u32 base_addr_cfg; - u32 base_addr; - int ret; -- bool acpi_conflict = false; - struct resource *res; - - /* Setup power management base register */ -@@ -780,20 +779,11 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, - res = wdt_io_res(ICH_RES_IO_TCO); - res->start = base_addr + ACPIBASE_TCO_OFF; - res->end = base_addr + ACPIBASE_TCO_END; -- ret = acpi_check_resource_conflict(res); -- if (ret) { -- acpi_conflict = true; -- goto wdt_done; -- } - - res = wdt_io_res(ICH_RES_IO_SMI); - res->start = base_addr + ACPIBASE_SMI_OFF; - res->end = base_addr + ACPIBASE_SMI_END; -- ret = acpi_check_resource_conflict(res); -- if (ret) { -- acpi_conflict = true; -- goto wdt_done; -- } -+ - lpc_ich_enable_acpi_space(dev); - - /* -@@ -813,11 +803,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, - res = wdt_mem_res(ICH_RES_MEM_GCS); - res->start = base_addr + ACPIBASE_GCS_OFF; - res->end = base_addr + ACPIBASE_GCS_END; -- ret = acpi_check_resource_conflict(res); -- if (ret) { -- acpi_conflict = true; -- goto wdt_done; -- } - } - - lpc_ich_finalize_cell(&lpc_ich_cells[LPC_WDT], id); -@@ -825,9 +810,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, - 1, NULL, 0); - - wdt_done: -- if (acpi_conflict) -- pr_warn("Resource conflict(s) found affecting %s\n", -- lpc_ich_cells[LPC_WDT].name); - return ret; - } - --- -1.7.1 - - \ No newline at end of file
