Merge branch 'master'

5 files changed, 11 insertions, 8 deletions

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index e197ce9353de..e80ef9467825 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1432,7 +1432,8 @@ static int usb_generic_suspend(struct device *dev, pm_message_t message)
                         mark_quiesced(intf);
         } else {
                 // FIXME else if there's no suspend method, disconnect...
-                dev_warn(dev, "no %s?\n", "suspend");
+                dev_warn(dev, "no suspend for driver %s?\n", driver->name);
+                mark_quiesced(intf);
                 status = 0;
         }
         return status;
@@ -1460,8 +1461,10 @@ static int usb_generic_resume(struct device *dev)
         }
 
         if ((dev->driver == NULL) ||
-            (dev->driver_data == &usb_generic_driver_data))
+            (dev->driver_data == &usb_generic_driver_data)) {
+                dev->power.power_state.event = PM_EVENT_FREEZE;
                 return 0;
+        }
 
         intf = to_usb_interface(dev);
         driver = to_usb_driver(dev->driver);
@@ -1481,7 +1484,7 @@ static int usb_generic_resume(struct device *dev)
                         mark_quiesced(intf);
                 }
         } else
-                dev_warn(dev, "no %s?\n", "resume");
+                dev_warn(dev, "no resume for driver %s?\n", driver->name);
         return 0;
 }
 
diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index 1c3b472a3bca..0e2505c073db 100644
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/usb/input/aiptek.c
@@ -2103,7 +2103,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
          * values.
          */
         input_set_abs_params(inputdev, ABS_X, 0, 2999, 0, 0);
-        input_set_abs_params(inputdev, ABS_X, 0, 2249, 0, 0);
+        input_set_abs_params(inputdev, ABS_Y, 0, 2249, 0, 0);
         input_set_abs_params(inputdev, ABS_PRESSURE, 0, 511, 0, 0);
         input_set_abs_params(inputdev, ABS_TILT_X, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);
         input_set_abs_params(inputdev, ABS_TILT_Y, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);
diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index a248664b5d1d..fd48e74e78ed 100644
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/usb/input/kbtab.c
@@ -159,7 +159,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
         input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH);
         input_dev->mscbit[0] |= BIT(MSC_SERIAL);
         input_set_abs_params(input_dev, ABS_X, 0, 0x2000, 4, 0);
-        input_set_abs_params(input_dev, ABS_X, 0, 0x1750, 4, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);
 
         endpoint = &intf->cur_altsetting->endpoint[0].desc;
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c
index aea1cfae34cc..dc099bbe12bf 100644
--- a/drivers/usb/input/wacom.c
+++ b/drivers/usb/input/wacom.c
@@ -854,7 +854,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         input_dev->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH) | BIT(BTN_STYLUS);
-        input_set_abs_params(input_dev, ABS_X, 0, wacom->features->y_max, 4, 0);
+        input_set_abs_params(input_dev, ABS_X, 0, wacom->features->x_max, 4, 0);
         input_set_abs_params(input_dev, ABS_Y, 0, wacom->features->y_max, 4, 0);
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom->features->pressure_max, 0, 0);
 
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 4837524eada7..4ef5527028c5 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -109,7 +109,7 @@ static int slave_configure(struct scsi_device *sdev)
          * data comes from.
          */
         if (sdev->scsi_level < SCSI_2)
-                sdev->scsi_level = SCSI_2;
+                sdev->scsi_level = sdev->sdev_target->scsi_level = SCSI_2;
 
         /* According to the technical support people at Genesys Logic,
          * devices using their chips have problems transferring more than
@@ -162,7 +162,7 @@ static int slave_configure(struct scsi_device *sdev)
                  * a Get-Max-LUN request, we won't lose much by setting the
                  * revision level down to 2.  The only devices that would be
                  * affected are those with sparse LUNs. */
-                sdev->scsi_level = SCSI_2;
+                sdev->scsi_level = sdev->sdev_target->scsi_level = SCSI_2;
 
                 /* USB-IDE bridges tend to report SK = 0x04 (Non-recoverable
                  * Hardware Error) when any low-level error occurs,