Merge tag 'staging-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver update from Greg KH:
 "Here's the big drivers/staging/ update for 3.13-rc1.

  Nothing major here, just a _ton_ of fixes and cleanups, mostly driven
  by the new round of OPW applicants, but also there are lots of other
  people doing staging tree cleanups these days in order to help get the
  drivers into mergable shape.

  We also merge, and then revert, the ktap code, as Ingo and the other
  perf/ftrace developers feel it should go into the "real" part of the
  kernel with only a bit more work, so no need to put it in staging for
  now.

  All of this has been in linux-next for a while with no reported
  issues"

* tag 'staging-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1045 commits)
  staging: drm/imx: fix return value check in ipu_add_subdevice_pdata()
  Staging: zram: Fix access of NULL pointer
  Staging: zram: Fix variable dereferenced before check
  Staging: rtl8187se: space prohibited before semicolon in r8185b_init.c
  Staging: rtl8187se: fix space prohibited after that open parenthesis '(' in r8185b_init.c
  Staging: rtl8187se: fix braces {} are not necessary for single statement blocks in r8185b_init.c
  Staging: rtl8187se: fix trailing whitespace in r8185b_init.c
  Staging: rtl8187se: fix please, no space before tabs in r8185b_init.c
  drivers/staging/nvec/Kconfig: remove trailing whitespace
  Staging: dwc2: Fix variable dereferenced before check
  Staging: xgifb: fix braces {} are not necessary for any arm of this statement
  staging: rtl8192e: remove unneeded semicolons
  staging: rtl8192e: use true and false for bool variables
  staging: ft1000: return values corrected in scram_start_dwnld
  staging: ft1000: change values of status return variable in write_dpram32_and_check
  staging: bcm: Remove unnecessary pointer casting
  imx-drm: ipuv3-crtc: Invert IPU DI0 clock polarity
  staging: r8188eu: Fix sparse warnings in rtl_p2p.c
  staging: r8188eu: Fix sparse warnings in rtw_mlme_ext.c
  staging: r8188eu: Fix sparse warnings in rtl8188e.cmd.c
  ...

1 files changed, 35 insertions, 10 deletions

diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 10e1581022cf..88fc5aefcd96 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -465,6 +465,39 @@ static int sensor_hub_raw_event(struct hid_device *hdev,
         return 1;
 }
 
+int sensor_hub_device_open(struct hid_sensor_hub_device *hsdev)
+{
+        int ret = 0;
+        struct sensor_hub_data *data =  hid_get_drvdata(hsdev->hdev);
+
+        mutex_lock(&data->mutex);
+        if (!hsdev->ref_cnt) {
+                ret = hid_hw_open(hsdev->hdev);
+                if (ret) {
+                        hid_err(hsdev->hdev, "failed to open hid device\n");
+                        mutex_unlock(&data->mutex);
+                        return ret;
+                }
+        }
+        hsdev->ref_cnt++;
+        mutex_unlock(&data->mutex);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(sensor_hub_device_open);
+
+void sensor_hub_device_close(struct hid_sensor_hub_device *hsdev)
+{
+        struct sensor_hub_data *data =  hid_get_drvdata(hsdev->hdev);
+
+        mutex_lock(&data->mutex);
+        hsdev->ref_cnt--;
+        if (!hsdev->ref_cnt)
+                hid_hw_close(hsdev->hdev);
+        mutex_unlock(&data->mutex);
+}
+EXPORT_SYMBOL_GPL(sensor_hub_device_close);
+
 static int sensor_hub_probe(struct hid_device *hdev,
                                 const struct hid_device_id *id)
 {
@@ -506,12 +539,6 @@ static int sensor_hub_probe(struct hid_device *hdev,
                 hid_err(hdev, "hw start failed\n");
                 return ret;
         }
-        ret = hid_hw_open(hdev);
-        if (ret) {
-                hid_err(hdev, "failed to open input interrupt pipe\n");
-                goto err_stop_hw;
-        }
-
         INIT_LIST_HEAD(&sd->dyn_callback_list);
         sd->hid_sensor_client_cnt = 0;
         report_enum = &hdev->report_enum[HID_INPUT_REPORT];
@@ -520,7 +547,7 @@ static int sensor_hub_probe(struct hid_device *hdev,
         if (dev_cnt > HID_MAX_PHY_DEVICES) {
                 hid_err(hdev, "Invalid Physical device count\n");
                 ret = -EINVAL;
-                goto err_close;
+                goto err_stop_hw;
         }
         sd->hid_sensor_hub_client_devs = kzalloc(dev_cnt *
                                                 sizeof(struct mfd_cell),
@@ -528,7 +555,7 @@ static int sensor_hub_probe(struct hid_device *hdev,
         if (sd->hid_sensor_hub_client_devs == NULL) {
                 hid_err(hdev, "Failed to allocate memory for mfd cells\n");
                         ret = -ENOMEM;
-                        goto err_close;
+                        goto err_stop_hw;
         }
         list_for_each_entry(report, &report_enum->report_list, list) {
                 hid_dbg(hdev, "Report id:%x\n", report->id);
@@ -565,8 +592,6 @@ err_free_names:
         for (i = 0; i < sd->hid_sensor_client_cnt ; ++i)
                 kfree(sd->hid_sensor_hub_client_devs[i].name);
         kfree(sd->hid_sensor_hub_client_devs);
-err_close:
-        hid_hw_close(hdev);
 err_stop_hw:
         hid_hw_stop(hdev);