mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge 3.10-rc3 into char-misc-next
We want the changes in here. Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
f35c69b736
841 changed files with 9115 additions and 5727 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue