On Thu, 14 Jun 2001, Alan Cox wrote:

> These are already fixed in the -ac tree
>
> Please people - check the -ac tree before wasting time on these
>

Hmm - I did indeed forget to check the -ac tree, I have done so now, and
there is no difference between the vanilla kernel and the -ac one in
those places that i can see. The second fix is not needed after closer
inspection (mea culpa), but the first is still valid AFAICS.

Steve
Ps. Apologise if I've fumbled it again.


--- ide-probe.c.orig    Thu Jun 14 14:05:31 2001
+++ ide-probe.c Fri Jun 15 11:03:17 2001
@@ -58,6 +58,11 @@
        struct hd_driveid *id;

        id = drive->id = kmalloc (SECTOR_WORDS*4, GFP_ATOMIC);  /* called with interrupts disabled! */
+       if(id == NULL)
+       {
+               printk(KERN_ERR "ide-probe: Failed to allocate memory for hd_driveid struct, aborting\n");
+               return;
+       }
        ide_input_data(drive, id, SECTOR_WORDS);                /* read 512 bytes of id info */
        ide__sti();     /* local CPU only */
        ide_fix_driveid(id);

-- 
"My mom had Windows at work and it hurt her eyes real bad"

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/