diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-22 21:16:30 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-22 21:16:30 -0800 |
| commit | d167529dacbad453f1449e5e78b4857c6e687bf0 (patch) | |
| tree | 651bab959bbc0204bef30d17f8368f100f6a8421 /i2c | |
| parent | eb6b406dcc7096974eec722b436e0f05eca353a4 (diff) | |
| download | patches-d167529dacbad453f1449e5e78b4857c6e687bf0.tar.gz | |
more pci usb and spi patches
Diffstat (limited to 'i2c')
| -rw-r--r-- | i2c/w1-use-kthread-api.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/i2c/w1-use-kthread-api.patch b/i2c/w1-use-kthread-api.patch index 1251fc035fa27..de380b9f80dae 100644 --- a/i2c/w1-use-kthread-api.patch +++ b/i2c/w1-use-kthread-api.patch @@ -15,10 +15,10 @@ Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/w1/w1.c | 58 +++++++++++++++------------------------------------- + drivers/w1/w1.c | 56 ++++++++++++++-------------------------------------- drivers/w1/w1.h | 3 -- - drivers/w1/w1_int.c | 34 +++++++++--------------------- - 3 files changed, 29 insertions(+), 66 deletions(-) + drivers/w1/w1_int.c | 34 ++++++++++--------------------- + 3 files changed, 28 insertions(+), 65 deletions(-) --- gregkh-2.6.orig/drivers/w1/w1.c +++ gregkh-2.6/drivers/w1/w1.c @@ -121,16 +121,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; if (!dev->initialized) -@@ -840,8 +818,7 @@ int w1_process(void *data) +@@ -840,7 +818,6 @@ int w1_process(void *data) } atomic_dec(&dev->refcnt); - complete_and_exit(&dev->dev_exited, 0); -- -+ + return 0; } - @@ -873,11 +850,11 @@ static int w1_init(void) goto err_out_master_unregister; } |