From: Greg Kroah-Hartman Date: Mon, 29 Oct 2012 18:44:40 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.50~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66ac0efe44b81466ac325ffa8cdca65a4ab990ea;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch staging-comedi-amplc_pc236-fix-invalid-register-access-during-detach.patch --- diff --git a/queue-3.0/drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch b/queue-3.0/drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch new file mode 100644 index 00000000000..1553877cb7c --- /dev/null +++ b/queue-3.0/drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch @@ -0,0 +1,37 @@ +From 9756fe38d10b2bf90c81dc4d2f17d5632e135364 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Fri, 22 Jun 2012 09:43:07 +0200 +Subject: drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13 + +From: Sjoerd Simons + +commit 9756fe38d10b2bf90c81dc4d2f17d5632e135364 upstream. + +This box claims to have an LVDS interface but doesn't +actually have one. + +Signed-off-by: Sjoerd Simons +Signed-off-by: Daniel Vetter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/intel_lvds.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/gpu/drm/i915/intel_lvds.c ++++ b/drivers/gpu/drm/i915/intel_lvds.c +@@ -751,6 +751,14 @@ static const struct dmi_system_id intel_ + DMI_MATCH(DMI_BOARD_NAME, "MS-7469"), + }, + }, ++ { ++ .callback = intel_no_lvds_dmi_callback, ++ .ident = "ZOTAC ZBOXSD-ID12/ID13", ++ .matches = { ++ DMI_MATCH(DMI_BOARD_VENDOR, "ZOTAC"), ++ DMI_MATCH(DMI_BOARD_NAME, "ZBOXSD-ID12/ID13"), ++ }, ++ }, + + { } /* terminating entry */ + }; diff --git a/queue-3.0/series b/queue-3.0/series index 623a1a78560..e6fa14c5f9e 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -30,3 +30,5 @@ bcma-fix-unregistration-of-cores.patch cpufreq-powernow-k8-remove-usage-of-smp_processor_id-in-preemptible-code.patch x86-mm-find_early_table_space-based-on-ranges-that-are-actually-being-mapped.patch x86-mm-undo-incorrect-revert-in-arch-x86-mm-init.c.patch +staging-comedi-amplc_pc236-fix-invalid-register-access-during-detach.patch +drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch diff --git a/queue-3.0/staging-comedi-amplc_pc236-fix-invalid-register-access-during-detach.patch b/queue-3.0/staging-comedi-amplc_pc236-fix-invalid-register-access-during-detach.patch new file mode 100644 index 00000000000..1f9805bf9e8 --- /dev/null +++ b/queue-3.0/staging-comedi-amplc_pc236-fix-invalid-register-access-during-detach.patch @@ -0,0 +1,40 @@ +From aaeb61a97b7159ebe30b18a422d04eeabfa8790b Mon Sep 17 00:00:00 2001 +From: Ian Abbott +Date: Wed, 3 Oct 2012 16:25:17 +0100 +Subject: staging: comedi: amplc_pc236: fix invalid register access during detach + +From: Ian Abbott + +commit aaeb61a97b7159ebe30b18a422d04eeabfa8790b upstream. + +`pc236_detach()` is called by the comedi core if it attempted to attach +a device and failed. `pc236_detach()` calls `pc236_intr_disable()` if +the comedi device private data pointer (`devpriv`) is non-null. This +test is insufficient as `pc236_intr_disable()` accesses hardware +registers and the attach routine may have failed before it has saved +their I/O base addresses. + +Fix it by checking `dev->iobase` is non-zero before calling +`pc236_intr_disable()` as that means the I/O base addresses have been +saved and the hardware registers can be accessed. It also implies the +comedi device private data pointer is valid, so there is no need to +check it. + +Signed-off-by: Ian Abbott +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/comedi/drivers/amplc_pc236.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/comedi/drivers/amplc_pc236.c ++++ b/drivers/staging/comedi/drivers/amplc_pc236.c +@@ -470,7 +470,7 @@ static int pc236_detach(struct comedi_de + { + printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, + PC236_DRIVER_NAME); +- if (devpriv) ++ if (dev->iobase) + pc236_intr_disable(dev); + + if (dev->irq)