diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 16:17:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 16:17:48 +0300 |
| commit | 15e7f8b92aed71819411025279cd3df37f8c636b (patch) | |
| tree | 6bc90fd9fcdd4e58321e3f881b2fbcb108a6a654 /drivers/gpu/drm/drm_mm.c | |
| parent | 21949f00a022e090a7e8bc9a01dfca88273c6146 (diff) | |
| parent | ef18beded8ddbaafdf4914bab209f77e60ae3a18 (diff) | |
| download | linux-15e7f8b92aed71819411025279cd3df37f8c636b.tar.xz | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/gpu/drm/drm_mm.c')
| -rw-r--r-- | drivers/gpu/drm/drm_mm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index d7d7eac3ddd2..cdec32977129 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c @@ -358,7 +358,7 @@ struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm, if (entry->size >= size + wasted) { if (!best_match) return entry; - if (size < best_size) { + if (entry->size < best_size) { best = entry; best_size = entry->size; } @@ -408,7 +408,7 @@ struct drm_mm_node *drm_mm_search_free_in_range(const struct drm_mm *mm, if (entry->size >= size + wasted) { if (!best_match) return entry; - if (size < best_size) { + if (entry->size < best_size) { best = entry; best_size = entry->size; } |