redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Drivers for 4.9:

Browse source 
- Coccinelle fixes for atmel-ebi and atmel-sdramc
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJX2Qy6AAoJENiigzvaE+LCW4YP/iWOwQaKm3C1rMHVrvfv2phS
 4nZEeFMDmDhNoLpX2v4JPhI3TV6R5f+2zaO4YrfoVreUPFkpALL6lSaUa1LDNlrg
 qpOBKSTmmpDH/9wSqQG2dY41O6slNII0EAwWvo6ctkLTiDOE02HUdlAHRmxbKEPQ
 B7JEaApUKSvlGo6mVCMOF38F4E+eBL+i5SlEsbSrqcQ9HIkbw8c2ts0v+3ly+aUF
 m+TT6KmG46kV6WaXWHw5JhCnJdNF0/snEaON7vzAr21j2FFSls2JIGywWBPJ4HN/
 9KT79p6OLJwuaS3VwKjg3BGApsBiPJKrXQyXT9gI7BO1/PdZdzFsXz65aMo6qlXd
 WtYKjCZuzuzxIzCXDFtz1aj7E46F5x7bUVTuBBrvMSI8RkwJfEpSx1X9F/qIdHuV
 Vp4+ckqCicaND8D/hqwfv2Zx6jIAG/9L6g08OzP/3A5ZgpcXk4hJ1wFCpssegXJa
 VYooqeTFNxB44k1UbmA2hf3qz+Fw0lt0v2aF/KPTTp3ozb/epcEzQVImPCiKMIjK
 Ead7W8lowxHFyVZRa0wrpgID0Laxn1b2Px2WQG/V9JQzZzSmD94T2HDSc3simOQi
 L7dvy+ABg9ZaVwZSXIckwG+c9tVYwJy1dspAMUW7TcXqDkyLVNhA56oxBZN3Rg3H
 Gop+/hFP2q0KfahejmKq
 =QhIH
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-4.9-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers

Pull "at91 drivers for 4.9" from Alexandre Belloni:

 - Coccinelle fixes for atmel-ebi and atmel-sdramc

* tag 'at91-ab-4.9-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  memory: atmel-sdramc: fix a possible NULL dereference
  memory: atmel-ebi: use PTR_ERR_OR_ZERO() to simplify the code
This commit is contained in:
Arnd Bergmann 2016-09-15 00:17:39 +02:00
parent 132166589c 7922118f8f
commit e747ea14de
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/memory/atmel-ebi.c
View file

@ -410,10 +410,7 @@ static int at91sam9_ebi_init(struct at91_ebi *ebi)
field.reg = AT91SAM9_SMC_MODE(AT91SAM9_SMC_GENERIC);
fields->mode = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);
if (IS_ERR(fields->mode))
return PTR_ERR(fields->mode);
return 0;
return PTR_ERR_OR_ZERO(fields->mode);
}
static int sama5d3_ebi_init(struct at91_ebi *ebi)
@ -441,10 +438,7 @@ static int sama5d3_ebi_init(struct at91_ebi *ebi)
field.reg = SAMA5_SMC_MODE(SAMA5_SMC_GENERIC);
fields->mode = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);
if (IS_ERR(fields->mode))
return PTR_ERR(fields->mode);
return 0;
return PTR_ERR_OR_ZERO(fields->mode);
}
static int at91_ebi_dev_setup(struct at91_ebi *ebi, struct device_node *np,

4
drivers/memory/atmel-sdramc.c
View file

@ -53,12 +53,10 @@ static const struct of_device_id atmel_ramc_of_match[] = {
static int atmel_ramc_probe(struct platform_device *pdev)
{
const struct of_device_id *match;
const struct at91_ramc_caps *caps;
struct clk *clk;
match = of_match_device(atmel_ramc_of_match, &pdev->dev);
caps = match->data;
caps = of_device_get_match_data(&pdev->dev);
if (caps->has_ddrck) {
clk = devm_clk_get(&pdev->dev, "ddrck");