Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 19588
b: refs/heads/master
c: 0271fc2
h: refs/heads/master
v: v3
  • Loading branch information
Jeremy Higdon authored and Linus Torvalds committed Feb 2, 2006
1 parent 1bc885e commit 1546af4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 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: b4103333d7904310d34de18d85e51e3d74f00a3b
refs/heads/master: 0271fc2db6260dd46f196191e24281af2fddb879
9 changes: 4 additions & 5 deletions trunk/drivers/ide/pci/sgiioc4.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved.
* Copyright (c) 2003-2006 Silicon Graphics, Inc. All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License
Expand Down Expand Up @@ -510,7 +510,7 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir)
drive->name);
goto use_pio_instead;
} else {
u32 xcount, bcount =
u32 bcount =
0x10000 - (cur_addr & 0xffff);

if (bcount > cur_len)
Expand All @@ -525,8 +525,7 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir)
*table = 0x0;
table++;

xcount = bcount & 0xffff;
*table = cpu_to_be32(xcount);
*table = cpu_to_be32(bcount);
table++;

cur_addr += bcount;
Expand Down Expand Up @@ -680,7 +679,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d)
return -EIO;

/* Create /proc/ide entries */
create_proc_ide_interfaces();
create_proc_ide_interfaces();

return 0;
}
Expand Down

0 comments on commit 1546af4

Please sign in to comment.