diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 20:26:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 20:26:42 -0800 |
| commit | 2c1f1895ef2aa8f0e5497893eff71304aef332e1 (patch) | |
| tree | c7e17f739b121f5db12608117b757065e08a23f0 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 635b3c9d5508d1dfe02ee5f882becea37e294111 (diff) | |
| parent | a81406b4143ff07e586bbe03c50f089da94eefe1 (diff) | |
| download | kernel_samsung_crespo-2c1f1895ef2aa8f0e5497893eff71304aef332e1.zip kernel_samsung_crespo-2c1f1895ef2aa8f0e5497893eff71304aef332e1.tar.gz kernel_samsung_crespo-2c1f1895ef2aa8f0e5497893eff71304aef332e1.tar.bz2 | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: rs600: use correct mask for SW interrupt
gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test
drm/radeon/radeon_device.c: move a dereference below a NULL test
drm/radeon/radeon_fence.c: move a dereference below the NULL test
drm/radeon/radeon_connectors.c: add a NULL test before dereference
drm/radeon/kms: fix memory leak
drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
drm/edid: Fix CVT width/height decode
drm/edid: Skip empty CVT codepoints
drm: remove address mask param for drm_pci_alloc()
drm/radeon/kms: add missing breaks in i2c and ss lookups
drm/radeon/kms: add primary dac adj values table
drm/radeon/kms: fallback to default connector table
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 21950ef..2748609 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4839,7 +4839,7 @@ int i915_gem_init_phys_object(struct drm_device *dev, phys_obj->id = id; - phys_obj->handle = drm_pci_alloc(dev, size, 0, 0xffffffff); + phys_obj->handle = drm_pci_alloc(dev, size, 0); if (!phys_obj->handle) { ret = -ENOMEM; goto kfree_obj; |