From 89adafa4b14aca755a89be9a6bcd035809026ce8 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 5 Sep 2012 18:58:32 -0700 Subject: [PATCH] --- yaml --- r: 324927 b: refs/heads/master c: bbea99d9c7221f69cadb4fd764f2a65e6292c756 h: refs/heads/master i: 324925: 2f3cbe8389015ce28d7b464c0751317205c8451a 324923: b7154c0d899e2ebf789af2deca9f2e2116c1a922 324919: 199990874a8f03f0174a8e2bd0e543c7d2356eab 324911: e3dfe34225e0ab57389a518be37b41b0297e24ea 324895: cae48393a9359529178a7fc8316e70007b1dbd57 324863: 14aac42b0a1a75e423a9b57c264f0ce0d3827545 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/usbduxfast.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a76e47e16f56..9f368ca35b2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4760904fb4a2841c9ac651e36610724929122385 +refs/heads/master: bbea99d9c7221f69cadb4fd764f2a65e6292c756 diff --git a/trunk/drivers/staging/comedi/drivers/usbduxfast.c b/trunk/drivers/staging/comedi/drivers/usbduxfast.c index 8eb41257c6ce..3f68fc396301 100644 --- a/trunk/drivers/staging/comedi/drivers/usbduxfast.c +++ b/trunk/drivers/staging/comedi/drivers/usbduxfast.c @@ -346,7 +346,7 @@ static void usbduxfastsub_ai_Irq(struct urb *urb) return; } /* subdevice which is the AD converter */ - s = this_comedidev->subdevices + SUBDEV_AD; + s = &this_comedidev->subdevices[SUBDEV_AD]; /* first we test if something unusual has just happened */ switch (urb->status) { @@ -1453,7 +1453,7 @@ static int usbduxfast_attach_common(struct comedi_device *dev, /* private structure is also simply the usb-structure */ dev->private = udfs; /* the first subdevice is the A/D converter */ - s = dev->subdevices + SUBDEV_AD; + s = &dev->subdevices[SUBDEV_AD]; /* * the URBs get the comedi subdevice which is responsible for reading * this is the subdevice which reads data