diff --git a/[refs] b/[refs] index 6c720acb3e88..007d2f841de3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea38d13fd1666bc030cb1c0feec5b0da2f89f9b2 +refs/heads/master: 74ea0e599215330e8964401508a5d7ec41ef15b0 diff --git a/trunk/drivers/regulator/tps65910-regulator.c b/trunk/drivers/regulator/tps65910-regulator.c index 6bf864b4bdf6..e1b01ec82301 100644 --- a/trunk/drivers/regulator/tps65910-regulator.c +++ b/trunk/drivers/regulator/tps65910-regulator.c @@ -1136,7 +1136,7 @@ static inline struct tps65910_board *tps65910_parse_dt_reg_data( struct of_regulator_match **tps65910_reg_matches) { *tps65910_reg_matches = NULL; - return 0; + return NULL; } #endif