]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fec'
authorDavid S. Miller <davem@davemloft.net>
Mon, 22 Jul 2013 23:50:38 +0000 (16:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Jul 2013 23:50:38 +0000 (16:50 -0700)
commitdf6573e74d576e6f69a7b3461d1351dd795992ff
tree8d5d903de54a8ab5d31605d5077fa3b5fc8934f7
parentaa40a2828e15e7c4f97dd96509be313592dc9c70
parent47a726b8b3ce60f9848cfd09145942b72cc07913
Merge branch 'fec'

Fabio Estevam says:

====================
This series improves clock handling in the driver by not enabling/disabling
the optional ptp and enet_out clocks unconditionally, check for the return value
of clk_prepare_enable and also handle clk_ptp in suspend/resume.

Remove an unneeded check in platform_get_resource() and also use
devm_request_irq() that can help to simplify the code.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Frank Li <lznuaa@gmail.com>