diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-08-05 13:18:22 +0200 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-08-05 13:20:09 +0200 |
| commit | 088eef2219bd1e8cb82bfcb5b32c1c687aeea6d7 (patch) | |
| tree | ed5bc8f678f2c0dff70012fcd9d2a601e80991d7 /arch/arm/plat-samsung | |
| parent | xen/tmem: do not allow XEN_TMEM on ARM64 (diff) | |
| parent | Linux 3.10-rc2 (diff) | |
| download | linux-088eef2219bd1e8cb82bfcb5b32c1c687aeea6d7.tar.xz linux-088eef2219bd1e8cb82bfcb5b32c1c687aeea6d7.zip | |
Merging v3.10-rc2 as I need to apply a fix for
3cc8e40e8ff8e232a9dd672da81beabd09f87366
"xen/arm: rename xen_secondary_init and run it on every online cpu"
The commit is in v3.10-rc2, the current branch is based on v3.10-rc1.
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/adc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c index ca07cb1b155a..79690f2f6d3f 100644 --- a/arch/arm/plat-samsung/adc.c +++ b/arch/arm/plat-samsung/adc.c @@ -381,11 +381,6 @@ static int s3c_adc_probe(struct platform_device *pdev) } regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!regs) { - dev_err(dev, "failed to find registers\n"); - return -ENXIO; - } - adc->regs = devm_ioremap_resource(dev, regs); if (IS_ERR(adc->regs)) return PTR_ERR(adc->regs); |