pciehp: don't enable slot unless forced
authorMark Lord <lkml@rtr.ca>
Mon, 17 Mar 2008 20:04:23 +0000 (16:04 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Mar 2008 02:26:05 +0000 (19:26 -0700)
commit9e5858244926f4fddf8ba38a6b4fa3fe68e93836
tree2fb883f73d5a3eb007d3b9124077312fe9d549d2
parentbde4f8fa8db2abd5ac9c542d76012d0fedab050f
pciehp: don't enable slot unless forced

This fixes a 2.6.25 regression reported by Alex Chiang.

Invoke pciehp_enable_slot() at startup only when pciehp_force=1.
Some HP equipment apparently cannot cope with it otherwise.

This restores the (previously working) 2.6.24 behaviour here,
while allowing machines that need a kick to use pciehp_force=1.

This was the original design back in October 2007,
but Kristen suggested we try without it first:

   Kristen Carlson Accardi wrote:
   >I think it would be ok to try allowing the slot to be enabled when not
   >using pciehp_force mode.  We can wrap it later if it proves to break things

This ended up breaking one of Alex's setups,
so it's time to put the wrapper back in now.

Signed-off-by: Mark Lord <mlord@pobox.com>
Acked-by: Alex Chiang <achiang@hp.com>
Acked-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/pci/hotplug/pciehp_core.c