From 6a07ea967bbf9e0d5e0051dc9ce6e4d55f76eff3 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 21 Jan 2013 14:37:15 -0700 Subject: [PATCH] --- yaml --- r: 354117 b: refs/heads/master c: 57b71c3e6f4c8b944e6721d89ccb566aee439f97 h: refs/heads/master i: 354115: c0439e82a977ff592980cb7b796a8ad668d48a8f v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d8eaf9ebbf11..ef068a09c925 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40f58a65c9f6cbb540ec2db6ac9d963d402014c3 +refs/heads/master: 57b71c3e6f4c8b944e6721d89ccb566aee439f97 diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index e5fe2e1f83f7..7e8ee5dde3be 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -178,8 +178,16 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev, unsigned int buf_size; int ret; - BUG_ON((s->subdev_flags & (SDF_CMD_READ | SDF_CMD_WRITE)) == 0); - BUG_ON(!s->do_cmdtest); + if ((s->subdev_flags & (SDF_CMD_READ | SDF_CMD_WRITE)) == 0) { + dev_warn(dev->class_dev, + "async subdevices must support SDF_CMD_READ or SDF_CMD_WRITE\n"); + return -EINVAL; + } + if (!s->do_cmdtest) { + dev_warn(dev->class_dev, + "async subdevices must have a do_cmdtest() function\n"); + return -EINVAL; + } async = kzalloc(sizeof(*async), GFP_KERNEL); if (!async) {