File tree Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -692,10 +692,6 @@ static int at24_probe(struct i2c_client *client)
692
692
nvmem_config .word_size = 1 ;
693
693
nvmem_config .size = byte_len ;
694
694
695
- at24 -> nvmem = devm_nvmem_register (dev , & nvmem_config );
696
- if (IS_ERR (at24 -> nvmem ))
697
- return PTR_ERR (at24 -> nvmem );
698
-
699
695
i2c_set_clientdata (client , at24 );
700
696
701
697
err = regulator_enable (at24 -> vcc_reg );
@@ -708,6 +704,13 @@ static int at24_probe(struct i2c_client *client)
708
704
pm_runtime_set_active (dev );
709
705
pm_runtime_enable (dev );
710
706
707
+ at24 -> nvmem = devm_nvmem_register (dev , & nvmem_config );
708
+ if (IS_ERR (at24 -> nvmem )) {
709
+ pm_runtime_disable (dev );
710
+ regulator_disable (at24 -> vcc_reg );
711
+ return PTR_ERR (at24 -> nvmem );
712
+ }
713
+
711
714
/*
712
715
* Perform a one-byte test read to verify that the
713
716
* chip is functional.
You can’t perform that action at this time.
0 commit comments