diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 14:40:05 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 14:40:05 +0000 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /arch/ia64/pci/pci.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'arch/ia64/pci/pci.c')
| -rw-r--r-- | arch/ia64/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 20d76fae24e..30dbc98bf0b 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -700,7 +700,7 @@ int ia64_pci_legacy_read(struct pci_bus *bus, u16 port, u32 *val, u8 size) */ int ia64_pci_legacy_write(struct pci_dev *bus, u16 port, u32 val, u8 size) { - int ret = 0; + int ret = size; switch (size) { case 1: |