瀏覽代碼

Merge remote-tracking branch 'regulator/topic/core' into regulator-next

Mark Brown 10 年之前
父節點
當前提交
15db0c8d79
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/regulator/core.c

+ 3 - 1
drivers/regulator/core.c

@@ -828,7 +828,7 @@ static void print_constraints(struct regulator_dev *rdev)
 	if (!count)
 	if (!count)
 		sprintf(buf, "no parameters");
 		sprintf(buf, "no parameters");
 
 
-	rdev_info(rdev, "%s\n", buf);
+	rdev_dbg(rdev, "%s\n", buf);
 
 
 	if ((constraints->min_uV != constraints->max_uV) &&
 	if ((constraints->min_uV != constraints->max_uV) &&
 	    !(constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE))
 	    !(constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE))
@@ -1713,6 +1713,8 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev)
 				gpiod_put(pin->gpiod);
 				gpiod_put(pin->gpiod);
 				list_del(&pin->list);
 				list_del(&pin->list);
 				kfree(pin);
 				kfree(pin);
+				rdev->ena_pin = NULL;
+				return;
 			} else {
 			} else {
 				pin->request_count--;
 				pin->request_count--;
 			}
 			}