From 5b6fd429e14de4e6f5435033c800b60a1fab7064 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 29 Oct 2012 17:09:54 -0700 Subject: [PATCH] --- yaml --- r: 337460 b: refs/heads/master c: 14cb151d29fa0fc0ebe22f01876a4408657a0ac3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4e24d0adaca1..5d1d46ea7c53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24f78463d58993764faba60ac22a9a637b40e746 +refs/heads/master: 14cb151d29fa0fc0ebe22f01876a4408657a0ac3 diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c index 95a1974abce0..68b85e2925c5 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c @@ -92,7 +92,7 @@ static unsigned short addi_eeprom_readw_93c76(unsigned long iobase, unsigned short val = 0; unsigned int cmd; unsigned int tmp; - int i; + int i; /* Send EEPROM read command and offset to EEPROM */ cmd = EE93C76_READ_CMD | (addr / 2); @@ -143,7 +143,8 @@ static unsigned short addi_eeprom_readw_nvram(unsigned long iobase, /* Load the high 8 bit address */ outb(NVCMD_LOAD_HIGH, iobase + AMCC_OP_REG_MCSR_NVCMD); addi_eeprom_nvram_wait(iobase); - outb(((addr + i) >> 8) & 0xff, iobase + AMCC_OP_REG_MCSR_NVDATA); + outb(((addr + i) >> 8) & 0xff, + iobase + AMCC_OP_REG_MCSR_NVDATA); addi_eeprom_nvram_wait(iobase); /* Read the eeprom data byte */