From: Viresh Kumar Date: Fri, 26 Feb 2016 11:14:19 +0000 (+0530) Subject: greybus: hid: Replace WARN_ON() with dev_err() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9b22f155beb4e5a71f86710034b478ec43af9c43;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git greybus: hid: Replace WARN_ON() with dev_err() WARN_ON() is a bit harsh here, as we just failed to power-off the HID device while it is getting removed. Replace it with dev_err(). Signed-off-by: Viresh Kumar Reviewed-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c index 601ee6fc81d5..6ef151f61ffc 100644 --- a/drivers/staging/greybus/hid.c +++ b/drivers/staging/greybus/hid.c @@ -345,6 +345,7 @@ static int gb_hid_open(struct hid_device *hid) static void gb_hid_close(struct hid_device *hid) { struct gb_hid *ghid = hid->driver_data; + int ret; /* * Protecting hid->open to make sure we don't restart data acquistion @@ -355,7 +356,10 @@ static void gb_hid_close(struct hid_device *hid) clear_bit(GB_HID_STARTED, &ghid->flags); /* Save some power */ - WARN_ON(gb_hid_set_power(ghid, GB_HID_TYPE_PWR_OFF)); + ret = gb_hid_set_power(ghid, GB_HID_TYPE_PWR_OFF); + if (ret) + dev_err(&ghid->connection->bundle->dev, + "failed to power off (%d)\n", ret); } mutex_unlock(&gb_hid_open_mutex); }