From: Yanir Lubetkin Date: Tue, 9 Jun 2015 22:15:05 +0000 (+0300) Subject: e1000e: fix locking issue with e1000e_disable_aspm X-Git-Tag: omap-for-v4.2/fixes-rc1^2~57^2~13^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beb0a1520bec17cfaf0c3c77bbdd56cbf942883a;p=pandora-kernel.git e1000e: fix locking issue with e1000e_disable_aspm e1000e_disable_aspm called pci_disable_link_state_locked which requires pci_bus_sem to be held, but is also called from places where this semaphore was not previously acquired. This patch implements two flavors of disable_aspm, one that acquires the lock, and the other (_locked) which should be called when the semaphore is already acquired. Signed-off-by: Yanir Lubetkin Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- Reading git-diff-tree failed