diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /drivers/gpu | |
parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_fence.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ring.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_object.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index bbcd1dd7bac0..1f8229436570 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c | |||
@@ -322,7 +322,7 @@ void radeon_fence_unref(struct radeon_fence **fence) | |||
322 | 322 | ||
323 | *fence = NULL; | 323 | *fence = NULL; |
324 | if (tmp) { | 324 | if (tmp) { |
325 | kref_put(&tmp->kref, &radeon_fence_destroy); | 325 | kref_put(&tmp->kref, radeon_fence_destroy); |
326 | } | 326 | } |
327 | } | 327 | } |
328 | 328 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index c6776e48fdde..08c0233db1b8 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c | |||
@@ -194,7 +194,7 @@ int radeon_ib_pool_init(struct radeon_device *rdev) | |||
194 | r = radeon_bo_kmap(rdev->ib_pool.robj, &ptr); | 194 | r = radeon_bo_kmap(rdev->ib_pool.robj, &ptr); |
195 | radeon_bo_unreserve(rdev->ib_pool.robj); | 195 | radeon_bo_unreserve(rdev->ib_pool.robj); |
196 | if (r) { | 196 | if (r) { |
197 | DRM_ERROR("radeon: failed to map ib poll (%d).\n", r); | 197 | DRM_ERROR("radeon: failed to map ib pool (%d).\n", r); |
198 | return r; | 198 | return r; |
199 | } | 199 | } |
200 | for (i = 0; i < RADEON_IB_POOL_SIZE; i++) { | 200 | for (i = 0; i < RADEON_IB_POOL_SIZE; i++) { |
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c index 75e9d6f86ba4..ebddd443d91a 100644 --- a/drivers/gpu/drm/ttm/ttm_object.c +++ b/drivers/gpu/drm/ttm/ttm_object.c | |||
@@ -206,7 +206,7 @@ void ttm_base_object_unref(struct ttm_base_object **p_base) | |||
206 | */ | 206 | */ |
207 | 207 | ||
208 | write_lock(&tdev->object_lock); | 208 | write_lock(&tdev->object_lock); |
209 | (void)kref_put(&base->refcount, &ttm_release_base); | 209 | kref_put(&base->refcount, ttm_release_base); |
210 | write_unlock(&tdev->object_lock); | 210 | write_unlock(&tdev->object_lock); |
211 | } | 211 | } |
212 | EXPORT_SYMBOL(ttm_base_object_unref); | 212 | EXPORT_SYMBOL(ttm_base_object_unref); |