From 8126a2c1634cb23a2ad300f5f9dfc537570c999b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 18 Nov 2008 11:51:41 -0800 Subject: [PATCH] --- yaml --- r: 126701 b: refs/heads/master c: b1853a4f28db5b532542426965198171ef8ab6a0 h: refs/heads/master i: 126699: ad240b0e3a4743912a42e8425ee7b2b41f4dada3 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/dt9812.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9671a8d23afc..106cdb16d482 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98f3c672b55cd246c62b763986a494152c7f2483 +refs/heads/master: b1853a4f28db5b532542426965198171ef8ab6a0 diff --git a/trunk/drivers/staging/comedi/drivers/dt9812.c b/trunk/drivers/staging/comedi/drivers/dt9812.c index 369048e50ef3..70ea748caab3 100644 --- a/trunk/drivers/staging/comedi/drivers/dt9812.c +++ b/trunk/drivers/staging/comedi/drivers/dt9812.c @@ -769,8 +769,6 @@ static int dt9812_probe(struct usb_interface *interface, * Seems like a configuration reset is necessary if driver is * reloaded while device is attached */ - int i; - usb_reset_configuration(dev->udev); for (i = 0; i < 10; i++) { retval = dt9812_read_info(dev, 1, &fw, sizeof(fw)); @@ -1060,7 +1058,7 @@ static int dt9812_attach(comedi_device *dev, comedi_devconfig *it) s->subdev_flags = SDF_READABLE | SDF_GROUND; s->n_chan = 0; s->maxdata = 1; - s->range_table = 0; + s->range_table = NULL; s->insn_read = &dt9812_ai_rinsn; /* analog output subdevice */ @@ -1069,7 +1067,7 @@ static int dt9812_attach(comedi_device *dev, comedi_devconfig *it) s->subdev_flags = SDF_WRITEABLE; s->n_chan = 0; s->maxdata = 1; - s->range_table = 0; + s->range_table = NULL; s->insn_write = &dt9812_ao_winsn; s->insn_read = &dt9812_ao_rinsn;