Messages in this thread | | | Subject | Re: LS120 enhancements | From | Paul Flinders <> | Date | 31 Dec 1998 21:47:19 +0000 |
| |
Junichi Saito <j.saito@wanadoo.fr> writes: > > I tried the ide-floppy.patch not against linux-2.1.132-ac2 but 2.2.0-pre1 > and got the following: > > ide-floppy.c: In function `idefloppy_ioctl': > ide-floppy.c:1463: void value not ignored as it ought to be > make[2]: *** [ide-floppy.o] Error 1 > > Is the patch valid only against 2.1.132-ac2 ? Or is there a way to fix > this ? The patch itself applied with some offsets but no *.rej.
The offsets should be ok - an alternative fix for the DMA related oops has been added to the 2.2 version of ide-floppy.c but there shouldn't be any issue in having both fixes in the code.
> > kernel compiled using gcc 2.7.2.3
There was a bug(let) in the patch - some junk from testing got left in the format unit ioctl.
Attached is a corrected patch which should apply OK against 2.2preX (although there will still be a 3 line offset for some of the hunks) but if you don't want to have to back out the original patch and apply this one then change the end of the FDFMTUNIT part of the switch statement in idefloppy_ioctl from
idefloppy_create_format_track_cmd (floppy, &pc, &f); idefloppy_queue_pc_tail (drive, &pc); return idefloppy_create_request_sense_cmd (&pc);
to
idefloppy_create_format_track_cmd (floppy, &pc, &f); return idefloppy_queue_pc_tail (drive, &pc);
[unhandled content-type:application/octet-stream]
| |