Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 131259
b: refs/heads/master
c: b52af40
h: refs/heads/master
i:
  131257: 3d0b8eb
  131255: 8ed5181
v: v3
  • Loading branch information
Clemens Ladisch authored and Ingo Molnar committed Feb 10, 2009
1 parent ee2b2da commit 2e347ba
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d315760ffa261c15ff92699ac6f514112543d7ca
refs/heads/master: b52af40923fc91a12e3c7152d833e0c0c6a508f6
17 changes: 8 additions & 9 deletions trunk/arch/x86/kernel/i8237.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ static int i8237A_resume(struct sys_device *dev)

flags = claim_dma_lock();

dma_outb(DMA1_RESET_REG, 0);
dma_outb(DMA2_RESET_REG, 0);
dma_outb(0, DMA1_RESET_REG);
dma_outb(0, DMA2_RESET_REG);

for (i = 0;i < 8;i++) {
for (i = 0; i < 8; i++) {
set_dma_addr(i, 0x000000);
/* DMA count is a bit weird so this is not 0 */
set_dma_count(i, 1);
Expand All @@ -51,14 +51,14 @@ static int i8237A_suspend(struct sys_device *dev, pm_message_t state)
}

static struct sysdev_class i8237_sysdev_class = {
.name = "i8237",
.suspend = i8237A_suspend,
.resume = i8237A_resume,
.name = "i8237",
.suspend = i8237A_suspend,
.resume = i8237A_resume,
};

static struct sys_device device_i8237A = {
.id = 0,
.cls = &i8237_sysdev_class,
.id = 0,
.cls = &i8237_sysdev_class,
};

static int __init i8237A_init_sysfs(void)
Expand All @@ -68,5 +68,4 @@ static int __init i8237A_init_sysfs(void)
error = sysdev_register(&device_i8237A);
return error;
}

device_initcall(i8237A_init_sysfs);

0 comments on commit 2e347ba

Please sign in to comment.