---

yaml --- r: 337460 b: refs/heads/master c: 14cb151 h: refs/heads/master v: v3
git-mirror · Oct 30, 2012 · 5b6fd42 · 5b6fd42
1 parent 7a4e246
commit 5b6fd42
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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 */