From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tormod Volden Subject: [PATCH] drm/sis: Fix building with CONFIG_FB_SIS/CONFIG_FB_SIS_MODULE Date: Sat, 29 Oct 2011 01:05:59 +0200 Message-ID: <1319843159-20263-1-git-send-email-lists.tormod@gmail.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-fx0-f49.google.com (mail-fx0-f49.google.com [209.85.161.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 6530D9E7FA for ; Fri, 28 Oct 2011 16:06:03 -0700 (PDT) Received: by faaf16 with SMTP id f16so5482259faa.36 for ; Fri, 28 Oct 2011 16:06:02 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter List-Id: dri-devel@lists.freedesktop.org From: Tormod Volden --- On top of danvet's kill-with-fire ad83cc3. Tormod drivers/gpu/drm/sis/sis_mm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c index 112a43b..63c2f75 100644 --- a/drivers/gpu/drm/sis/sis_mm.c +++ b/drivers/gpu/drm/sis/sis_mm.c @@ -116,7 +116,7 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file, item->req.size = mem->size; sis_malloc(&item->req); if (item->req.size == 0) - retval = -ENOMEN; + retval = -ENOMEM; offset = item->req.offset; #else retval = drm_mm_insert_node(&dev_priv->vram_mm, @@ -343,7 +343,7 @@ void sis_reclaim_buffers_locked(struct drm_device *dev, drm_mm_remove_node(&entry->mm_node); #if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE) else - sis_free(entry->req->offset); + sis_free(entry->req.offset); #endif kfree(entry); } -- 1.7.5.4