diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-16 16:34:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-16 16:34:55 -0700 |
| commit | c185b7a8e46386e5e426884cc6348a3bd713bf2e (patch) | |
| tree | 3b5f4705939b688f586bee452ab8ed010f76cb17 | |
| parent | 408492cb84df750929dc3b418526b4b8274420e4 (diff) | |
| parent | 4fe225dbd93dcf58599bc59430a764c7b55e0ec3 (diff) | |
Merge "soc: qcom: Fix compilation warning/error"
| -rw-r--r-- | include/soc/qcom/service-locator.h | 2 | ||||
| -rw-r--r-- | include/soc/qcom/service-notifier.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/soc/qcom/service-locator.h b/include/soc/qcom/service-locator.h index 6bf8ac0be15f..7fa25b90fc12 100644 --- a/include/soc/qcom/service-locator.h +++ b/include/soc/qcom/service-locator.h @@ -80,7 +80,7 @@ int find_subsys(const char *pd_path, char *subsys); #else static inline int get_service_location(char *client_name, - char *service_name, struct notifier_block *locator_nb); + char *service_name, struct notifier_block *locator_nb) { return -ENODEV; } diff --git a/include/soc/qcom/service-notifier.h b/include/soc/qcom/service-notifier.h index be3f134eebe3..90fceba091b9 100644 --- a/include/soc/qcom/service-notifier.h +++ b/include/soc/qcom/service-notifier.h @@ -53,7 +53,7 @@ static void *service_notif_register_notifier(const char *service_path, int instance_id, struct notifier_block *nb, int *curr_state) { - return -ENODEV; + return PTR_ERR(-ENODEV); } static int service_notif_unregister_notifier(void *service_notif_handle, |