From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 31 Oct 2012 23:58:09 +0000 (-0700)
Subject: staging: comedi: addi-data: remove 'allocated' from the private data
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~84^2~721
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=342481929705695b0cae6c75ed7180ef5143feff;p=pandora-kernel.git

staging: comedi: addi-data: remove 'allocated' from the private data

This variable is only used as a flag to indicate that the pci device
has been enabled. Use the comedi_device 'iobase' variable to indicate
this instead. This is how it's normally handled in the comedi pci
drivers.

Make the call to comedi_pci_disabled() in i_ADDI_Detach() common
and move it to the end of the function. Both the if and else case
require it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Reading git-diff-tree failed