diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:21 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:21 -0400 |
| commit | d14bc151a4f66871fd02fd9b28d8464859ca3ae2 (patch) | |
| tree | 0d868863b8a00960bc1d40a495fed8759be36951 /sound/soc/tegra/tegra_wm9712.c | |
| parent | 5b9fd76972836272afba57404d2662627926165b (diff) | |
| parent | a7fc5d256be9fda27bb69e872e6a212542a84230 (diff) | |
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next
Diffstat (limited to 'sound/soc/tegra/tegra_wm9712.c')
| -rw-r--r-- | sound/soc/tegra/tegra_wm9712.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c index 6839f88167d0..5e119630b0e0 100644 --- a/sound/soc/tegra/tegra_wm9712.c +++ b/sound/soc/tegra/tegra_wm9712.c | |||
| @@ -79,11 +79,6 @@ static int tegra_wm9712_driver_probe(struct platform_device *pdev) | |||
| 79 | struct tegra_wm9712 *machine; | 79 | struct tegra_wm9712 *machine; |
| 80 | int ret; | 80 | int ret; |
| 81 | 81 | ||
| 82 | if (!pdev->dev.of_node) { | ||
| 83 | dev_err(&pdev->dev, "No platform data supplied\n"); | ||
| 84 | return -EINVAL; | ||
| 85 | } | ||
| 86 | |||
| 87 | machine = devm_kzalloc(&pdev->dev, sizeof(struct tegra_wm9712), | 82 | machine = devm_kzalloc(&pdev->dev, sizeof(struct tegra_wm9712), |
| 88 | GFP_KERNEL); | 83 | GFP_KERNEL); |
| 89 | if (!machine) { | 84 | if (!machine) { |