2012-08-22 16:40:50

by Hartley Sweeten

[permalink] [raw]
Subject: [PATCH] staging: comedi: s626: fix build error due to subdevice pointer math removal

The subdevice pointer math removal patch introduced a build error
in the s626 driver. Fix it.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---

Not sure how this got thru. The build error did not appear until
I did a clean make.

drivers/staging/comedi/drivers/s626.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 60b492e..719f4c6 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -1002,12 +1002,13 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
*/
static void ResetADC(struct comedi_device *dev, uint8_t *ppl)
{
+ struct comedi_subdevice *s = &dev->subdevices[0];
+ struct comedi_cmd *cmd = &s->async->cmd;
register uint32_t *pRPS;
uint32_t JmpAdrs;
uint16_t i;
uint16_t n;
uint32_t LocalPPL;
- struct comedi_cmd *cmd = &(dev->subdevices[0]->async->cmd);

/* Stop RPS program in case it is currently running. */
MC_DISABLE(P_MC1, MC1_ERPS1);
--
1.7.11