From 4013bf8f1d676b987a03fd28387f3281bf29963c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Novotn=C3=BD?= Date: Sat, 10 Nov 2012 19:24:06 +0100 Subject: [PATCH] --- yaml --- r: 345389 b: refs/heads/master c: 1f2285d462c02ef9b82ee9c553a31884c23994f0 h: refs/heads/master i: 345387: b8f95d6fe6533c5df3d4cbb0c2f429e20dd192eb v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/device/base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 223eb82f9d70..debfb7a86674 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fced4b221177f48743a1ea29ad3f592da1215d87 +refs/heads/master: 1f2285d462c02ef9b82ee9c553a31884c23994f0 diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/device/base.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/device/base.c index ca9a4648bd8a..9baef4656a54 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/subdev/device/base.c +++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/device/base.c @@ -208,7 +208,7 @@ nouveau_devobj_ctor(struct nouveau_object *parent, /* determine frequency of timing crystal */ if ( device->chipset < 0x17 || - (device->chipset >= 0x20 && device->chipset <= 0x25)) + (device->chipset >= 0x20 && device->chipset < 0x25)) strap &= 0x00000040; else strap &= 0x00400040;