diff --git a/[refs] b/[refs] index bafb071ebc87..cdc6dcfcfa56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6be6e96fe90962171f31c099a5e7c28a49a0d0ae +refs/heads/master: afdaaafe8e829364d9c1276b5435cc28ee5619df diff --git a/trunk/drivers/regulator/max8997.c b/trunk/drivers/regulator/max8997.c index 77e0cfb30b23..b1c1444864b3 100644 --- a/trunk/drivers/regulator/max8997.c +++ b/trunk/drivers/regulator/max8997.c @@ -267,7 +267,6 @@ static int max8997_get_enable_register(struct regulator_dev *rdev, default: /* Not controllable or not exists */ return -EINVAL; - break; } return 0;