]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'r8152'
authorDavid S. Miller <davem@davemloft.net>
Thu, 9 Oct 2014 23:06:15 +0000 (19:06 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Oct 2014 23:06:15 +0000 (19:06 -0400)
Hayes Wang says:

====================
r8152: use mutex for hw settings

v2:
Make sure the autoresume wouldn't occur inside the mutex, otherwise
the dead lock would happen. For the purpose, adjust some code about
autosuspend/autoresume.

v1:
Use mutex to avoid that the serial hw settings would be interrupted
by other settings. Although there is no problem now, it makes the
driver more safe.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge