Merge branch 'master' of https://github.com/adafruit/Adafruit_Blinka into pwmout_deinit

diff --combined src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
index de663e9fe7d80d48afb74e8ff351e5cb541bb088,89e0cbb75223b57d921fc509b15fac44e32a2273..e7d64a0ab066510d6dbe406dc30c0b3a8476847d
--- 1/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
--- 2/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
@@@ -55,13 -55,13 +55,13 @@@ class PWMOut(object)
          self._open(pin, duty_cycle, frequency, variable_frequency)
  
      def __del__(self):
 -        self.close()
 +        self.deinit()
  
      def __enter__(self):
          return self
  
      def __exit__(self, t, value, traceback):
 -        self.close()
 +        self.deinit()
  
      def _open(self, pin, duty=0, freq=500, variable_frequency=False):
          self._channel = None
@@@ -90,12 -90,12 +90,12 @@@
          except IOError as e:
              raise PWMError(e.errno, "Exporting PWM pin: " + e.strerror)
  
-         self._set_enabled(False)
+         #self._set_enabled(False) # This line causes a write error when trying to enable
 -                
 +
          # Look up the period, for fast duty cycle updates
          self._period = self._get_period()
  
-         self.duty_cycle = 0
+         #self.duty_cycle = 0  # This line causes a write error when trying to enable
  
          # set frequency
          self.frequency = freq
@@@ -104,8 -104,8 +104,8 @@@
  
          self._set_enabled(True)
  
 -    def close(self):
 -        """Close the sysfs PWM."""
 +    def deinit(self):
 +        """Deinit the sysfs PWM."""
          if self._channel is not None:
              self.duty_cycle = 0
              try:
@@@ -128,7 -128,7 +128,7 @@@
          with open(path, 'w') as f_attr:
              #print(value, path)
              f_attr.write(value + "\n")
 -            
 +
      def _read_pin_attr(self, attr):
          path = os.path.join(
              self._sysfs_path,