projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 0b6fe132 KT |
1 | diff -urN linux.orig/linux-2.2.20-ow2/linux-2.2.20-ow2.diff linux/linux-2.2.20-ow2/linux-2.2.20-ow2.diff |
| 2 | --- linux.orig/linux-2.2.20-ow2/linux-2.2.20-ow2.diff Sat Apr 20 15:57:25 2002 | |
| 3 | +++ linux/linux-2.2.20-ow2/linux-2.2.20-ow2.diff Sat Apr 20 16:04:45 2002 | |
| 4 | @@ -943,58 +943,6 @@ | |
| 5 | ||
| 6 | # | |
| 7 | # Watchdog | |
| 8 | -diff -urPX nopatch linux-2.2.20/drivers/char/bttv.c linux/drivers/char/bttv.c | |
| 9 | ---- linux-2.2.20/drivers/char/bttv.c Sat Nov 3 01:07:45 2001 | |
| 10 | -+++ linux/drivers/char/bttv.c Thu Feb 28 23:26:10 2002 | |
| 11 | -@@ -1981,7 +1981,7 @@ | |
| 12 | - } | |
| 13 | - } else if (vw.clipcount > 2048) | |
| 14 | - return -ENOMEM; | |
| 15 | -- else { | |
| 16 | -+ else if (vw.clipcount) { | |
| 17 | - if((vcp=vmalloc(sizeof(struct video_clip)* | |
| 18 | - (vw.clipcount))) == NULL) | |
| 19 | - return -ENOMEM; | |
| 20 | -diff -urPX nopatch linux-2.2.20/drivers/net/zlib.c linux/drivers/net/zlib.c | |
| 21 | ---- linux-2.2.20/drivers/net/zlib.c Tue Feb 10 23:56:45 1998 | |
| 22 | -+++ linux/drivers/net/zlib.c Sat Mar 2 01:18:00 2002 | |
| 23 | -@@ -3860,10 +3860,11 @@ | |
| 24 | - &s->sub.trees.tb, z); | |
| 25 | - if (t != Z_OK) | |
| 26 | - { | |
| 27 | -- ZFREE(z, s->sub.trees.blens); | |
| 28 | - r = t; | |
| 29 | -- if (r == Z_DATA_ERROR) | |
| 30 | -+ if (r == Z_DATA_ERROR) { | |
| 31 | -+ ZFREE(z, s->sub.trees.blens); | |
| 32 | - s->mode = BADB; | |
| 33 | -+ } | |
| 34 | - LEAVE | |
| 35 | - } | |
| 36 | - s->sub.trees.index = 0; | |
| 37 | -@@ -3928,11 +3929,12 @@ | |
| 38 | - #endif | |
| 39 | - t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), | |
| 40 | - s->sub.trees.blens, &bl, &bd, &tl, &td, z); | |
| 41 | -- ZFREE(z, s->sub.trees.blens); | |
| 42 | - if (t != Z_OK) | |
| 43 | - { | |
| 44 | -- if (t == (uInt)Z_DATA_ERROR) | |
| 45 | -+ if (t == (uInt)Z_DATA_ERROR) { | |
| 46 | -+ ZFREE(z, s->sub.trees.blens); | |
| 47 | - s->mode = BADB; | |
| 48 | -+ } | |
| 49 | - r = t; | |
| 50 | - LEAVE | |
| 51 | - } | |
| 52 | -@@ -3949,6 +3951,7 @@ | |
| 53 | - s->sub.decode.tl = tl; | |
| 54 | - s->sub.decode.td = td; | |
| 55 | - } | |
| 56 | -+ ZFREE(z, s->sub.trees.blens); | |
| 57 | - s->mode = CODES; | |
| 58 | - case CODES: | |
| 59 | - UPDATE | |
| 60 | diff -urPX nopatch linux-2.2.20/drivers/scsi/st.c linux/drivers/scsi/st.c | |
| 61 | --- linux-2.2.20/drivers/scsi/st.c Sat Nov 3 01:07:50 2001 | |
| 62 | +++ linux/drivers/scsi/st.c Thu Feb 28 23:26:10 2002 |