Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262738AbUKZVZ7 (ORCPT ); Fri, 26 Nov 2004 16:25:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262732AbUKZVYr (ORCPT ); Fri, 26 Nov 2004 16:24:47 -0500 Received: from fallback.mail.elte.hu ([157.181.151.13]:9961 "EHLO fallback.mail.elte.hu") by vger.kernel.org with ESMTP id S264029AbUKZUOI (ORCPT ); Fri, 26 Nov 2004 15:14:08 -0500 Date: Thu, 25 Nov 2004 15:44:40 +0100 From: Ingo Molnar To: Rui Nuno Capela Cc: linux-kernel@vger.kernel.org, Andrew Morton , Linus Torvalds Subject: Re: [patch, 2.6.10-rc2] floppy boot-time detection fix Message-ID: <20041125144440.GA8022@elte.hu> References: <20041117124234.GA25956@elte.hu> <20041118123521.GA29091@elte.hu> <20041118164612.GA17040@elte.hu> <20041122005411.GA19363@elte.hu> <20041123175823.GA8803@elte.hu> <20041124101626.GA31788@elte.hu> <20041124112745.GA3294@elte.hu> <21889.195.245.190.93.1101377024.squirrel@195.245.190.93> <20041125120133.GA22431@elte.hu> <20041125143337.GA32051@elte.hu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041125143337.GA32051@elte.hu> User-Agent: Mutt/1.4.1i X-ELTE-SpamVersion: MailScanner 4.31.6-itk1 (ELTE 1.2) SpamAssassin 2.63 ClamAV 0.73 X-ELTE-VirusStatus: clean X-ELTE-SpamCheck: no X-ELTE-SpamCheck-Details: score=-4.9, required 5.9, autolearn=not spam, BAYES_00 -4.90 X-ELTE-SpamLevel: X-ELTE-SpamScore: -4 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 787 Lines: 28 > + current->state = TASK_UNINTERRUPTIBLE; > + schedule_timeout(HZ/100 + 1); should use msleep() of course: Signed-off-by: Ingo Molnar --- linux/drivers/block/floppy.c.orig +++ linux/drivers/block/floppy.c @@ -4504,6 +4504,12 @@ int __init floppy_init(void) floppy_track_buffer = NULL; max_buffer_sectors = 0; } + /* + * Small 10 msec delay to let through any interrupt that + * initialization might have triggered, to not + * confuse detection: + */ + msleep(10); for (i = 0; i < N_FDC; i++) { fdc = i; - 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/