Message ID | CAKEH-64P5HTWtqrgGoS4RF74XXOvnDZ4o5z2bx7LZ=9r=3tsjw@mail.gmail.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | Input: iforce - add missing vendor and product ids to the Unknown device name | expand |
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c index b2a68bc9f0b4..6de5d06d2bd0 100644 --- a/drivers/input/joystick/iforce/iforce-main.c +++ b/drivers/input/joystick/iforce/iforce-main.c @@ -323,7 +323,11 @@ int iforce_init_device(struct device *parent, u16 bustype, break; iforce->type = iforce_device + i; - input_dev->name = iforce->type->name; + if (iforce_device[i].idvendor) + input_dev->name = iforce->type->name; + else + input_dev->name = devm_kasprintf(parent, GFP_KERNEL, iforce->type->name, + input_dev->id.vendor, input_dev->id.product); /*