diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-23 20:56:35 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-23 20:56:35 +0300 |
| commit | aeb8f932080d62cdc305a7ccca9d60de34908b30 (patch) | |
| tree | f563df19e10e0d1fb5f8ab73902cc1d39f2ec177 /drivers/gpu/drm/ttm/ttm_memory.c | |
| parent | caf1578aefe7ebbc22376737e91ffa29ac14a33f (diff) | |
| parent | 9e6f3f472c8f95021ad048acc7cd3e40a827f8ce (diff) | |
| download | linux-aeb8f932080d62cdc305a7ccca9d60de34908b30.tar.xz | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_memory.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_memory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c index dbc2def887cd..a1803fbcc898 100644 --- a/drivers/gpu/drm/ttm/ttm_memory.c +++ b/drivers/gpu/drm/ttm/ttm_memory.c @@ -300,7 +300,8 @@ static int ttm_mem_init_highmem_zone(struct ttm_mem_global *glob, zone->glob = glob; glob->zone_highmem = zone; ret = kobject_init_and_add( - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name); + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", + zone->name); if (unlikely(ret != 0)) { kobject_put(&zone->kobj); return ret; |