From ace002862f75d1c8034cf95f240ee749fe26915e Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 18 Sep 2012 18:49:46 -0700 Subject: [PATCH] --- yaml --- r: 325428 b: refs/heads/master c: 8a3f3d37c58ea44a2441fe8be4d8cd0996fc0c3c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/daqboard2000.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad20a0e75da8..2909878eaba7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3dc031dd21ffb8d389c329e3429888212df467aa +refs/heads/master: 8a3f3d37c58ea44a2441fe8be4d8cd0996fc0c3c diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c index ff81829323fb..88037aea25ac 100644 --- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c +++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c @@ -762,8 +762,13 @@ static int daqboard2000_attach_pci(struct comedi_device *dev, s = &dev->subdevices[2]; result = subdev_8255_init(dev, s, daqboard2000_8255_cb, (unsigned long)(devpriv->daq + dioP2ExpansionIO8Bit)); + if (result) + return result; - return result; + dev_info(dev->class_dev, "%s: %s attached\n", + dev->driver->driver_name, dev->board_name); + + return 0; } static void daqboard2000_detach(struct comedi_device *dev)