diff options
| author | Greg Kroah-Hartman | 2013-05-27 10:40:19 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-05-27 10:40:19 +0900 |
| commit | f35c69b736e4f910d7447346980145212c283570 (patch) | |
| tree | 824b90cd870e6de07bbba19d761c1c74cf1fb4a7 /drivers/w1 | |
| parent | cd4373984a5903276f52777a6003425e023eaa7e (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge 3.10-rc3 into char-misc-next
We want the changes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/omap_hdq.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index db2390aed387..6e94d8dd3d00 100644 --- a/drivers/w1/masters/omap_hdq.c +++ b/drivers/w1/masters/omap_hdq.c @@ -555,11 +555,6 @@ static int omap_hdq_probe(struct platform_device *pdev) platform_set_drvdata(pdev, hdq_data); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_dbg(&pdev->dev, "unable to get resource\n"); - return -ENXIO; - } - hdq_data->hdq_base = devm_ioremap_resource(dev, res); if (IS_ERR(hdq_data->hdq_base)) return PTR_ERR(hdq_data->hdq_base); |