1. 31 May, 2015 2 commits
    • Vladimir Zapolskiy's avatar
      char: misc: restore MISC_DYNAMIC_MINOR on device_create() failure · b575f712
      Vladimir Zapolskiy authored
      On attempt to register a dynamic minor misc device its minor number is
      updated to a virtual minor number prior to device_create() call,
      however on error path misc->minor == MISC_DYNAMIC_MINOR is not
      restored.
      
      Following the rule of thumb that a function returning an error must
      not change the state of the caller, assign MISC_DYNAMIC_MINOR back.
      
      The problem is met in a sutuation, when subsys_initcall(misc_init) is
      not yet called and misc_class is not created, but misc_register()
      modifies statically defined ".minor = MISC_DYNAMIC_MINOR", therefore
      implicitly changing the client's logic on next attempt (e.g. retrying
      from deferred list) to register a misc device, whose minor number is
      converted from dynamic to some unknown static one.
      Signed-off-by: default avatarVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      b575f712
    • Greg Kroah-Hartman's avatar
      mei: fix up uuid matching · b144ce2d
      Greg Kroah-Hartman authored
      A previous commit, c93b76b3 ("mei: bus: report also uuid in module
      alias") caused a build error as I missed applying a needed patch to add
      some macros to uapi/linux/uuid.h.  Instead of those additional macros,
      change the mei code to use the existing uuid structure directly.
      
      Fixes: c93b76b3
      Cc: Tomas Winkler <tomas.winkler@intel.com>
      Cc: Samuel Ortiz <sameo@linux.intel.com>
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      b144ce2d
  2. 24 May, 2015 38 commits