Linux 2.2.13pre14

o	ANK's fix for the 1 second delay	(Alexey Kuznetsov)
o	Fix an IDE CD scribble on other memory	(Stephen, Ingo, Alan Cox)

diff --git a/Makefile b/Makefile
index 66b111509124012ec31ba3e1f508c14a0725979c..2a62dfed25510314db1baf3d8e66e00c2cfbffc0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 13
-EXTRAVERSION = pre13
+EXTRAVERSION = pre14
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 

diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index eafffafefb659c23e3f8b61cf01bc8219cee6d52..6367dcfead9d259838129e5ac739338be4a9c009 100644 (file)
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -1541,8 +1541,11 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio
        do_hwgroup_request(hwgroup);
        save_flags(flags);      /* all CPUs; overkill? */
        cli();                  /* all CPUs; overkill? */
-       if (action == ide_wait && rq->rq_status != RQ_INACTIVE)
+       if (action == ide_wait)
+       {
                down(&sem);     /* wait for it to be serviced */
+               rq->sem = NULL;
+       }
        restore_flags(flags);   /* all CPUs; overkill? */
        return rq->errors ? -EIO : 0;   /* return -EIO if errors */
 }

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index ba40033e5bf20559b81bb73c45f759aaed296c3f..29ac0a7f8f4337ad339c121fca6d8f97dc312436 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -419,6 +419,7 @@ void dev_deactivate(struct device *dev)
                for (hp = &qdisc_head.forw; (h = *hp) != &qdisc_head; hp = &h->forw) {
                        if (h == &qdisc->h) {
                                *hp = h->forw;
+                               h->forw = NULL;
                                break;
                        }
                }