Merge branch 'upstream' into for-linus

[sfrench/cifs-2.6.git] / drivers / hid / hid-wacom.c

diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 694545d5bfeab0ed2ce7fd8c5c5602bfd8aa36c3..067e2963314c6882a9f7854267048658388d2aea 100644 (file)
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -590,6 +590,7 @@ static int wacom_probe(struct hid_device *hdev,
                wacom_poke(hdev, 1);
                break;
        case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:
+               sprintf(hdev->name, "%s", "Wacom Intuos4 WL");
                wdata->features = 0;
                wacom_set_features(hdev);
                break;