| Message ID | 1347574001.8974.6.camel@phoenix (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
On Thu, 13 Sep 2012, Pandruvada, Srinivas wrote: > I think you can merge this patch with your patch 2/3 as both are > addressing hid_hw_close and hid_hw_stop. Agreed. In addition to that, I am fine with the changes. As this whole lot is going through Jonathan to Greg, I just add my Acked-by: Jiri Kosina <jkosina@suse.cz> and let Jonathan take it. Thanks,
Hi Alex, Can you resubmit your patches merging 2/3 and 3/3? Thanks, Srinivas -----Original Message----- From: Jiri Kosina [mailto:jkosina@suse.cz] Sent: Monday, September 17, 2012 3:58 AM To: Pandruvada, Srinivas Cc: Axel Lin; Jonathan Cameron; linux-input@vger.kernel.org Subject: RE: [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop() On Thu, 13 Sep 2012, Pandruvada, Srinivas wrote: > I think you can merge this patch with your patch 2/3 as both are > addressing hid_hw_close and hid_hw_stop. Agreed. In addition to that, I am fine with the changes. As this whole lot is going through Jonathan to Greg, I just add my Acked-by: Jiri Kosina <jkosina@suse.cz> and let Jonathan take it. Thanks, -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index f9d6209..b9ce38e 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -564,8 +564,7 @@ static int sensor_hub_probe(struct hid_device *hdev, sizeof(struct mfd_cell), GFP_KERNEL); if (sd->hid_sensor_hub_client_devs == NULL) { - hid_err(hdev, - "Failed to allocate memory for mfd cells\n"); + hid_err(hdev, "Failed to allocate memory for mfd cells\n"); ret = -ENOMEM; goto err_close; } @@ -577,8 +576,7 @@ static int sensor_hub_probe(struct hid_device *hdev, name = kasprintf(GFP_KERNEL, "HID-SENSOR-%x", field->physical); if (name == NULL) { - hid_err(hdev, - "Failed MFD device name\n"); + hid_err(hdev, "Failed MFD device name\n"); ret = -ENOMEM; goto err_free_names; } @@ -624,8 +622,8 @@ static void sensor_hub_remove(struct hid_device *hdev) int i; hid_dbg(hdev, " hardware removed\n"); - hid_hw_stop(hdev); hid_hw_close(hdev); + hid_hw_stop(hdev); spin_lock_irqsave(&data->lock, flags); if (data->pending.status) complete(&data->pending.ready);
Also adjust unnecessary change lines for hid_err. Signed-off-by: Axel Lin <axel.lin@gmail.com> --- drivers/hid/hid-sensor-hub.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)