Merge 3.3-rc6 into driver-core-next

This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4 files changed, 9 insertions, 7 deletions

diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
index 0c33ae9cf0f..406632472c1 100644
--- a/drivers/hid/hid-hyperv.c
+++ b/drivers/hid/hid-hyperv.c
@@ -548,6 +548,7 @@ static int mousevsc_remove(struct hv_device *dev)
         struct mousevsc_dev *input_dev = hv_get_drvdata(dev);
 
         vmbus_close(dev->channel);
+        hid_hw_stop(input_dev->hid_device);
         hid_destroy_device(input_dev->hid_device);
         mousevsc_free_device(input_dev);
 
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index b47e58b52d9..acab74cde72 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -531,7 +531,6 @@ static int wacom_probe(struct hid_device *hdev,
         wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
         wdata->battery.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
 
         ret = power_supply_register(&hdev->dev, &wdata->battery);
         if (ret) {
@@ -540,6 +539,8 @@ static int wacom_probe(struct hid_device *hdev,
                 goto err_battery;
         }
 
+        power_supply_powers(&wdata->battery, &hdev->dev);
+
         wdata->ac.properties = wacom_ac_props;
         wdata->ac.num_properties = ARRAY_SIZE(wacom_ac_props);
         wdata->ac.get_property = wacom_ac_get_property;
@@ -547,14 +548,14 @@ static int wacom_probe(struct hid_device *hdev,
         wdata->ac.type = POWER_SUPPLY_TYPE_MAINS;
         wdata->ac.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
-
         ret = power_supply_register(&hdev->dev, &wdata->ac);
         if (ret) {
                 hid_warn(hdev,
                          "can't create ac battery attribute, err: %d\n", ret);
                 goto err_ac;
         }
+
+        power_supply_powers(&wdata->ac, &hdev->dev);
 #endif
         return 0;
 
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c
index fc253b472f9..cac3589b1ed 100644
--- a/drivers/hid/hid-wiimote-core.c
+++ b/drivers/hid/hid-wiimote-core.c
@@ -1226,14 +1226,14 @@ static int wiimote_hid_probe(struct hid_device *hdev,
         wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
         wdata->battery.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
-
         ret = power_supply_register(&wdata->hdev->dev, &wdata->battery);
         if (ret) {
                 hid_err(hdev, "Cannot register battery device\n");
                 goto err_battery;
         }
 
+        power_supply_powers(&wdata->battery, &hdev->dev);
+
         ret = wiimote_leds_create(wdata);
         if (ret)
                 goto err_free;
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 7c297d305d5..b1ec0e2aeb5 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -922,11 +922,11 @@ void hiddev_disconnect(struct hid_device *hid)
         struct hiddev *hiddev = hid->hiddev;
         struct usbhid_device *usbhid = hid->driver_data;
 
+        usb_deregister_dev(usbhid->intf, &hiddev_class);
+
         mutex_lock(&hiddev->existancelock);
         hiddev->exist = 0;
 
-        usb_deregister_dev(usbhid->intf, &hiddev_class);
-
         if (hiddev->open) {
                 mutex_unlock(&hiddev->existancelock);
                 usbhid_close(hiddev->hid);