Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/topic/sunxi' into sunxi-next
Browse files Browse the repository at this point in the history
  • Loading branch information
wens committed Nov 16, 2016
2 parents 84f186f + 35db576 commit 4b6c358
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/sunxi/sun4i-codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ static int sun4i_codec_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Failed to get reset control\n");
return PTR_ERR(scodec->rst);
}
};
}

scodec->gpio_pa = devm_gpiod_get_optional(&pdev->dev, "allwinner,pa",
GPIOD_OUT_LOW);
Expand Down

0 comments on commit 4b6c358

Please sign in to comment.