Skip to content
Commit 403466fe authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fsl-fman-next'

Christophe JAILLET says:

====================
fsl/fman: Fix some error handling code in mac_probe

Commit c6e26ea8

 ("dpaa_eth: change device used") generated some
conflicts in my patches waiting for submission. So I took a closer look at
it.

So here is a serie of 4 patches.

The 1st one is just about a spurious call to 'dev_set_drvdata()', which is
done in only 1 error handling path in the function.

The 2nd one removes some devm_iounmap/release/kfree functions which look
useless to me.

The 3rd one fixes a missing of_node_put.

The 4th one is just cosmetic and removes a useless message.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 03ac738d e51f37bd
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment