2010-08-14 02:05:38

by Andreas Bombe

[permalink] [raw]
Subject: [PATCH] staging/comedi das08_cs.c: Fix io_req_t conversion

Commit 90abdc3b9 converted all PCMCIA users away from io_req_t. In
das08_cs.c the converted IO lines mask setting was added but the old
line using the now inexistent p_dev->io was not removed.

Signed-off-by: Andreas Bombe <[email protected]>
---
drivers/staging/comedi/drivers/das08_cs.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index c6aa52f..48d9fb1 100644
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -222,7 +222,6 @@ static int das08_pcmcia_config_loop(struct pcmcia_device *p_dev,
p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
p_dev->resource[0]->flags |=
pcmcia_io_cfg_data_width(io->flags);
- p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
p_dev->resource[0]->start = io->win[0].base;
p_dev->resource[0]->end = io->win[0].len;
if (io->nwin > 1) {
--
1.7.1


2010-08-14 08:32:26

by Dominik Brodowski

[permalink] [raw]
Subject: Re: [PATCH] staging/comedi das08_cs.c: Fix io_req_t conversion

Thanks, Andreas.

Greg, do you have other -staging stuff pending to push to Linus? If so,
could you take it? Otherwise, I'll queue it up for my bugfixes branch.

On Sat, Aug 14, 2010 at 03:24:22AM +0200, Andreas Bombe wrote:
> Commit 90abdc3b9 converted all PCMCIA users away from io_req_t. In
> das08_cs.c the converted IO lines mask setting was added but the old
> line using the now inexistent p_dev->io was not removed.
>
> Signed-off-by: Andreas Bombe <[email protected]>
Signed-off-by: Dominik Brodowski <[email protected]>

Best,
Dominik

2010-08-14 13:50:05

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH] staging/comedi das08_cs.c: Fix io_req_t conversion

On Sat, Aug 14, 2010 at 10:32:12AM +0200, Dominik Brodowski wrote:
> Thanks, Andreas.
>
> Greg, do you have other -staging stuff pending to push to Linus? If so,
> could you take it? Otherwise, I'll queue it up for my bugfixes branch.

Yes I do, I can take this, thanks.

greg k-h