[PATCH 15/23] i915_irq.c: drm_calloc to drm_zalloc and bugfix

[m.kozlowski@tuxland.pl]

[-- Attachment #1: i915_irq.diff --]
[-- Type: text/plain, Size: 917 bytes --]

This patch does drm_calloc to drm_zalloc conversion. Also it
seems that unpatched version allocated wrong nr of bytes.

drm_i915_vbl_swap_t *vbl_swap;

...

sizeof(vbl_swap) vs. sizeof(*vbl_swap)

No?

Please review.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>

 drivers/char/drm/i915_irq.c | 15749 -> 15746 (-3 bytes)
 drivers/char/drm/i915_irq.o | 128940 -> 128856 (-84 bytes)

 drivers/char/drm/i915_irq.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


--- linux-2.6.23-rc3-mm1.orig/drivers/char/drm/i915_irq.c
+++ linux-2.6.23-rc3-mm1/drivers/char/drm/i915_irq.c
@@ -541,8 +541,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
 		return DRM_ERR(EBUSY);
 	}

-	vbl_swap = drm_calloc(1, sizeof(vbl_swap), DRM_MEM_DRIVER);
-
+	vbl_swap = drm_zalloc(sizeof(*vbl_swap), DRM_MEM_DRIVER);
 	if (!vbl_swap) {
 		DRM_ERROR("Failed to allocate memory to queue swap\n");
 		return DRM_ERR(ENOMEM);

--