diff options
author | Tony Lindgren <tony@atomide.com> | 2017-11-28 07:06:34 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2017-11-28 07:06:34 -0800 |
commit | 2db57789e6612ce0cf2fcbb577a1c8307b708566 (patch) | |
tree | dd9f9e3dffabbf5cb932fcf5055ab329ca940fa0 /arch/arm/plat-samsung/adc.c | |
parent | f0c96c6d40312b1a76cd36709dc3eb5948c1b97f (diff) | |
parent | e9a9bb4e4779ca74cb52a6e2f8acbc0881d3bb18 (diff) |
Merge branch 'soc-fixes' into omap-for-v4.15/fixes
Diffstat (limited to 'arch/arm/plat-samsung/adc.c')
-rw-r--r-- | arch/arm/plat-samsung/adc.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c index daf3db9f0058..e9de9e92ce01 100644 --- a/arch/arm/plat-samsung/adc.c +++ b/arch/arm/plat-samsung/adc.c @@ -238,11 +238,9 @@ struct s3c_adc_client *s3c_adc_register(struct platform_device *pdev, if (!pdev) return ERR_PTR(-EINVAL); - client = kzalloc(sizeof(struct s3c_adc_client), GFP_KERNEL); - if (!client) { - dev_err(&pdev->dev, "no memory for adc client\n"); + client = kzalloc(sizeof(*client), GFP_KERNEL); + if (!client) return ERR_PTR(-ENOMEM); - } client->pdev = pdev; client->is_ts = is_ts; @@ -344,11 +342,9 @@ static int s3c_adc_probe(struct platform_device *pdev) int ret; unsigned tmp; - adc = devm_kzalloc(dev, sizeof(struct adc_device), GFP_KERNEL); - if (adc == NULL) { - dev_err(dev, "failed to allocate adc_device\n"); + adc = devm_kzalloc(dev, sizeof(*adc), GFP_KERNEL); + if (!adc) return -ENOMEM; - } spin_lock_init(&adc->lock); |