From 02d5b083e6720055d2a5f8a71d6d8f4a6d5f28ae Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Tue, 29 Jan 2013 14:05:58 +0000 Subject: [PATCH] --- yaml --- r: 354263 b: refs/heads/master c: 104640606be0df6bcdb5ec7960a9c3c1278117ae h: refs/heads/master i: 354261: 3f8578e1b099a3e5e2e4d3b8318d0b6cd9e7a810 354259: 2809ca634dcc451e281358f03570beda93d55e4c 354255: 471427e40b1b4dfb2f0e9d94f3a32295914f1248 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b592effb93a..cdba299917ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12e9a5f1df9bf274fb49fb8453196e9fe51c8d77 +refs/heads/master: 104640606be0df6bcdb5ec7960a9c3c1278117ae diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index b798e42ee014..fa534fe4864b 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -2358,8 +2358,10 @@ int comedi_alloc_subdevice_minor(struct comedi_device *dev, if (!info) return -ENOMEM; info->device = dev; - info->read_subdevice = s; - info->write_subdevice = s; + if (s->subdev_flags & SDF_CMD_READ) + info->read_subdevice = s; + if (s->subdev_flags & SDF_CMD_WRITE) + info->write_subdevice = s; spin_lock(&comedi_file_info_table_lock); for (i = COMEDI_FIRST_SUBDEVICE_MINOR; i < COMEDI_NUM_MINORS; ++i) { if (comedi_file_info_table[i] == NULL) {