Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / ide / ide-cd.c

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 2ff6204449300e088883d411b3c4f0f46d2eabaf..0b510bafd90e2904d989d4f8ce06b89f50ea1f76 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1756,7 +1756,7 @@ static int ide_cd_probe(ide_drive_t *drive)
 
        info->dev.parent = &drive->gendev;
        info->dev.release = ide_cd_release;
-       dev_set_name(&info->dev, dev_name(&drive->gendev));
+       dev_set_name(&info->dev, "%s", dev_name(&drive->gendev));
 
        if (device_register(&info->dev))
                goto out_free_disk;