summaryrefslogtreecommitdiff
authorMarcin Koƛcielnicki <koriakin@0x04.net>2012-05-21 12:51:50 (GMT)
committer Ben Skeggs <bskeggs@redhat.com>2012-05-22 00:33:26 (GMT)
commit4c992ac7f80057e6333e700cef91e22b42acdb51 (patch) (side-by-side diff)
tree0b94102889a92d460d9644e3b26b63c47ecd3345
parentb0f5bb66a9290d03c85042e91b316bfaa1e483d0 (diff)
downloadlinux-2.6-master.zip
linux-2.6-master.tar.gz
drm/nouveau/nvd9: Fix GPIO initialisation sequence.HEADmaster
Signed-off-by: Marcin Koƛcielnicki <koriakin@0x04.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.c b/drivers/gpu/drm/nouveau/nouveau_gpio.c
index f75ad66..a0911af 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gpio.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gpio.c
@@ -369,7 +369,7 @@ nouveau_gpio_reset(struct nouveau_device *ndev)
if (ndev->card_type >= NV_D0) {
nv_mask(ndev, 0x00d610 + (line * 4), 0xff, unk0);
if (unk1--)
- nv_mask(ndev, 0x00d640 + (unk1 * 4), 0xff, line);
+ nv_mask(ndev, 0x00d740 + (unk1 * 4), 0xff, line);
} else
if (ndev->card_type >= NV_50) {
static const u32 regs[] = { 0xe100, 0xe28c };