Message ID | 20100813185623.GC5853@comet.dominikbrodowski.net |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Fri, 13 Aug 2010, Dominik Brodowski wrote: > > could you apply the attached bugfix for PCMCIA, please? Alternatively, > please pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git master > > where this one patch is located. What do you prefer, actually, if it is just > one patch I want to push to you? Doesn't really matter. These days, my workflow is so git-centric that a simple "git pull" is a tiny simpler just because it's what I do day in and day out, and doesn't involve exporting a patch and applying it - but the difference is really so small that it matters not at all. And applying the patch as a patch avoids a sily merge for a trivial change. So it really can go both ways. I'll take the patch this time, because I happened to be in my "gather up patches" mode (which in turn is mostly because your subject said "PATCH" rather than "GIT PULL" - I had ignored the email while in my "git pull" phase). Which just goes to show how little I care, and how small details make me do one over the other. So I think you should just base it on how convenient it is for you. But if you have even just two patches, I probably prefer a "git pull". But again, it's not a big deal. Linus -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 4eb6f98..f581952 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c @@ -808,6 +808,7 @@ xirc2ps_config(struct pcmcia_device * link) } link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16; + link->io_lines = 10; if (local->modem) { int pass; @@ -839,7 +840,6 @@ xirc2ps_config(struct pcmcia_device * link) } printk(KNOT_XIRC "no ports available\n"); } else { - link->io_lines = 10; link->resource[0]->end = 16; for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) { link->resource[0]->start = ioaddr;