Messages in this thread | | | From | Bjorn Helgaas <> | Subject | Re: [PATCH] floppy: release only the ports we actually requested | Date | Fri, 6 Feb 2009 09:20:13 -0700 |
| |
On Friday 06 February 2009 01:55:01 am Philippe De Muyter wrote: > Bjorn, Andrew, > > -- > > With the last floppy patch, the floppy driver requests only the ports that > it really uses, but the code contains yet places where it releases those > unrequested ports. I don't know if it is harmfull, but I think it is cleaner > that the parameters of the release_region calls match the request_region ones.
Doh! Boy, do I feel stupid. I doubt this is in any git trees yet, so I'll combine the two patches and send a cleaner one.
Bjorn
> Signed-off-by: Philippe De Muyter <phdm@macqel.be> > > --- a/drivers/block/floppy.c 2009-02-06 08:56:33.000000000 +0100 > +++ b/drivers/block/floppy.c 2009-02-06 09:05:55.000000000 +0100 > @@ -4274,7 +4274,8 @@ static int __init floppy_init(void) > FDCS->rawcmd = 2; > if (user_reset_fdc(-1, FD_RESET_ALWAYS, 0)) { > /* free ioports reserved by floppy_grab_irq_and_dma() */ > - release_region(FDCS->address + 2, 4); > + release_region(FDCS->address + 2, 1); > + release_region(FDCS->address + 4, 2); > release_region(FDCS->address + 7, 1); > FDCS->address = -1; > FDCS->version = FDC_NONE; > @@ -4284,7 +4285,8 @@ static int __init floppy_init(void) > FDCS->version = get_fdc_version(); > if (FDCS->version == FDC_NONE) { > /* free ioports reserved by floppy_grab_irq_and_dma() */ > - release_region(FDCS->address + 2, 4); > + release_region(FDCS->address + 2, 1); > + release_region(FDCS->address + 4, 2); > release_region(FDCS->address + 7, 1); > FDCS->address = -1; > continue; > @@ -4510,7 +4512,8 @@ static void floppy_release_irq_and_dma(v > old_fdc = fdc; > for (fdc = 0; fdc < N_FDC; fdc++) > if (FDCS->address != -1) { > - release_region(FDCS->address + 2, 4); > + release_region(FDCS->address + 2, 1); > + release_region(FDCS->address + 4, 2); > release_region(FDCS->address + 7, 1); > } > fdc = old_fdc; >
| |