From c8ed7283af56dd2f700faf71714405a34045be0d Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Mon, 21 Nov 2011 08:57:56 +0000 Subject: [PATCH] --- yaml --- r: 277962 b: refs/heads/master c: b30f8bdcfa7dd05f4268348f3388ff903132f28e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/eeprom/eeprom_93cx6.c | 3 +++ trunk/include/linux/eeprom_93cx6.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7d6b0f197514..21c01082516b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9008ee99c77207b2f6aee67e5f849b1e1400a11 +refs/heads/master: b30f8bdcfa7dd05f4268348f3388ff903132f28e diff --git a/trunk/drivers/misc/eeprom/eeprom_93cx6.c b/trunk/drivers/misc/eeprom/eeprom_93cx6.c index 7b33de95c4bf..a6037af6f076 100644 --- a/trunk/drivers/misc/eeprom/eeprom_93cx6.c +++ b/trunk/drivers/misc/eeprom/eeprom_93cx6.c @@ -63,6 +63,7 @@ static void eeprom_93cx6_startup(struct eeprom_93cx6 *eeprom) eeprom->reg_data_out = 0; eeprom->reg_data_clock = 0; eeprom->reg_chip_select = 1; + eeprom->drive_data = 1; eeprom->register_write(eeprom); /* @@ -101,6 +102,7 @@ static void eeprom_93cx6_write_bits(struct eeprom_93cx6 *eeprom, */ eeprom->reg_data_in = 0; eeprom->reg_data_out = 0; + eeprom->drive_data = 1; /* * Start writing all bits. @@ -140,6 +142,7 @@ static void eeprom_93cx6_read_bits(struct eeprom_93cx6 *eeprom, */ eeprom->reg_data_in = 0; eeprom->reg_data_out = 0; + eeprom->drive_data = 0; /* * Start reading all bits. diff --git a/trunk/include/linux/eeprom_93cx6.h b/trunk/include/linux/eeprom_93cx6.h index c4627cbdb8e0..e04546e9c592 100644 --- a/trunk/include/linux/eeprom_93cx6.h +++ b/trunk/include/linux/eeprom_93cx6.h @@ -46,6 +46,7 @@ * @register_write(struct eeprom_93cx6 *eeprom): handler to * write to the eeprom register by using all reg_* fields. * @width: eeprom width, should be one of the PCI_EEPROM_WIDTH_* defines + * @drive_data: Set if we're driving the data line. * @reg_data_in: register field to indicate data input * @reg_data_out: register field to indicate data output * @reg_data_clock: register field to set the data clock @@ -62,6 +63,7 @@ struct eeprom_93cx6 { int width; + char drive_data; char reg_data_in; char reg_data_out; char reg_data_clock;