diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-07-25 12:30:27 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-07-25 12:30:49 +0200 |
| commit | a3f8612700507a10ad7186fd77e9f46c7af88335 (patch) | |
| tree | f00be0b726748113ffeb4e1caf7ade7ef33cfabe /drivers/ide/ide-gd.c | |
| parent | 8ecada16512c90ae782b00f15ebff0c32e4cd92a (diff) | |
| parent | 07bc9dc1b01bad7084fed3d2659e5d83317869bc (diff) | |
Merge branch 'master' into for-next
Sync with Linus' master to be able to apply
trivial patche to newer code.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/ide/ide-gd.c')
| -rw-r--r-- | drivers/ide/ide-gd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c index de86631e767d..838996a0039e 100644 --- a/drivers/ide/ide-gd.c +++ b/drivers/ide/ide-gd.c @@ -392,7 +392,7 @@ static int ide_gd_probe(ide_drive_t *drive) idkp->dev.parent = &drive->gendev; idkp->dev.release = ide_disk_release; - dev_set_name(&idkp->dev, dev_name(&drive->gendev)); + dev_set_name(&idkp->dev, "%s", dev_name(&drive->gendev)); if (device_register(&idkp->dev)) goto out_free_disk; |