From 348694bc0534bc12dbcf6fcef91a589e10f962d3 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 10 Feb 2012 20:04:52 +0800 Subject: [PATCH] --- yaml --- r: 293641 b: refs/heads/master c: 51a59ac8739b333eaa43a3102b6acaab5037bfa2 h: refs/heads/master i: 293639: 72bca943c09f8780874c85a7fe890de6f43db827 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/intel_gmbus.c | 2 +- trunk/drivers/gpu/drm/i915/intel_i2c.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 42a8c4c587d7..302370501d6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ade510153ecb7d50aaf9338fb2def2d5a80f1e1e +refs/heads/master: 51a59ac8739b333eaa43a3102b6acaab5037bfa2 diff --git a/trunk/drivers/gpu/drm/gma500/intel_gmbus.c b/trunk/drivers/gpu/drm/gma500/intel_gmbus.c index 147584ac8d02..9db90527bf0f 100644 --- a/trunk/drivers/gpu/drm/gma500/intel_gmbus.c +++ b/trunk/drivers/gpu/drm/gma500/intel_gmbus.c @@ -395,7 +395,7 @@ int gma_intel_setup_gmbus(struct drm_device *dev) struct drm_psb_private *dev_priv = dev->dev_private; int ret, i; - dev_priv->gmbus = kcalloc(sizeof(struct intel_gmbus), GMBUS_NUM_PORTS, + dev_priv->gmbus = kcalloc(GMBUS_NUM_PORTS, sizeof(struct intel_gmbus), GFP_KERNEL); if (dev_priv->gmbus == NULL) return -ENOMEM; diff --git a/trunk/drivers/gpu/drm/i915/intel_i2c.c b/trunk/drivers/gpu/drm/i915/intel_i2c.c index 7fa4f640e6fd..03573e00471b 100644 --- a/trunk/drivers/gpu/drm/i915/intel_i2c.c +++ b/trunk/drivers/gpu/drm/i915/intel_i2c.c @@ -375,7 +375,7 @@ int intel_setup_gmbus(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; int ret, i; - dev_priv->gmbus = kcalloc(sizeof(struct intel_gmbus), GMBUS_NUM_PORTS, + dev_priv->gmbus = kcalloc(GMBUS_NUM_PORTS, sizeof(struct intel_gmbus), GFP_KERNEL); if (dev_priv->gmbus == NULL) return -ENOMEM;