Merge branch 'core/debug' into core/urgent

[~andy/linux] / drivers / gpu / drm / nouveau / nouveau_gpio.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.c b/drivers/gpu/drm/nouveau/nouveau_gpio.c
index a580cc62337a7ed3150ab77fb07da22e6df88a60..82c19e82ff02e6914fd1b8923b87dd3fe44fe60e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_gpio.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gpio.c
@@ -387,7 +387,7 @@ nouveau_gpio_reset(struct drm_device *dev)
                if (dev_priv->card_type >= NV_D0) {
                        nv_mask(dev, 0x00d610 + (line * 4), 0xff, unk0);
                        if (unk1--)
-                               nv_mask(dev, 0x00d640 + (unk1 * 4), 0xff, line);
+                               nv_mask(dev, 0x00d740 + (unk1 * 4), 0xff, line);
                } else
                if (dev_priv->card_type >= NV_50) {
                        static const u32 regs[] = { 0xe100, 0xe28c };