From 212a582f36e05a86b3673ab11dcebf320a19bffa Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 4 Apr 2013 14:59:06 +0100 Subject: [PATCH] --- yaml --- r: 363919 b: refs/heads/master c: 0918e595ae45d99e0bd8a9950a0f0cb0e2a9c948 h: refs/heads/master i: 363917: 26d5a0749de351fd742e1ed1f98ef2f45ad7078b 363915: 1752fa217bce454758f4921ca054b496b17807ce 363911: 59e18da0cb825af4a0c94253ad1c2e052b1af527 363903: 49deb8cdabcc25d3147c1b2f35863dee4b32a32e v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a4a8e847ca8a..11cc8cda2183 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea1cc3973a6f3832956d99f74b20970a4e71bd37 +refs/heads/master: 0918e595ae45d99e0bd8a9950a0f0cb0e2a9c948 diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index 00481357a7b8..b73d8066cd15 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -85,7 +85,6 @@ struct comedi_file_info { struct comedi_device *device; struct comedi_subdevice *read_subdevice; struct comedi_subdevice *write_subdevice; - struct device *hardware_device; }; static DEFINE_MUTEX(comedi_board_minor_table_lock); @@ -2368,7 +2367,6 @@ struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device) return ERR_PTR(-ENOMEM); } info->device = dev; - info->hardware_device = hardware_device; comedi_device_init(dev); comedi_set_hw_dev(dev, hardware_device); mutex_lock(&dev->mutex); @@ -2415,7 +2413,7 @@ void comedi_release_hardware_device(struct device *hardware_device) minor++) { mutex_lock(&comedi_board_minor_table_lock); info = comedi_board_minor_table[minor]; - if (info && info->hardware_device == hardware_device) { + if (info && info->device->hw_dev == hardware_device) { comedi_board_minor_table[minor] = NULL; mutex_unlock(&comedi_board_minor_table_lock); comedi_free_board_file_info(info);