diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 09:10:06 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 09:10:06 (GMT) |
| commit | 1dd3294677d5484e4813c6c454ba7f192a3ef61d (patch) | |
| tree | e29306ffe8b709a7499a25ecbe3234f833fc7002 /drivers/input/gameport/gameport.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | e941da3110422c4e57c3d05759fb9475b28f45f6 (diff) | |
| download | linux-fsl-qoriq-1dd3294677d5484e4813c6c454ba7f192a3ef61d.tar.xz | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/gameport/gameport.c')
| -rw-r--r-- | drivers/input/gameport/gameport.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c index 2880eaa..ebf4be5 100644 --- a/drivers/input/gameport/gameport.c +++ b/drivers/input/gameport/gameport.c @@ -530,8 +530,7 @@ static void gameport_init_port(struct gameport *gameport) mutex_init(&gameport->drv_mutex); device_initialize(&gameport->dev); - snprintf(gameport->dev.bus_id, sizeof(gameport->dev.bus_id), - "gameport%lu", (unsigned long)atomic_inc_return(&gameport_no) - 1); + dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return(&gameport_no) - 1); gameport->dev.bus = &gameport_bus; gameport->dev.release = gameport_release_port; if (gameport->parent) |