From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933097AbbGGWBY (ORCPT ); Tue, 7 Jul 2015 18:01:24 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59002 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752614AbbGGWBA (ORCPT ); Tue, 7 Jul 2015 18:01:00 -0400 Date: Tue, 7 Jul 2015 15:00:54 -0700 From: Greg Kroah-Hartman To: Linus Torvalds Cc: Tomas Winkler , Arnd Bergmann , Alexander Usyskin , Linux Kernel Mailing List , Samuel Ortiz Subject: Re: [char-misc 4.2] mei: nfc: fix deadlock on shutdown/suspend path Message-ID: <20150707220054.GA29402@kroah.com> References: <1436304123-7501-1-git-send-email-tomas.winkler@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23+89 (0255b37be491) (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 07, 2015 at 02:40:13PM -0700, Linus Torvalds wrote: > On Tue, Jul 7, 2015 at 2:22 PM, Tomas Winkler wrote: > > In function mei_nfc_host_exit mei_cl_remove_device cannot be called > > under the device mutex as device removing flow invokes the device driver > > remove handler that calls in turn to mei_cl_disable_device which > > naturally acquires the device mutex. > > Yup, tested and confirmed. This patch fixes things for me without the > revert. Thanks. > > Greg, should I just apply it directly, or do we go through your tree? Feel free to take it directly, that way it fixes your laptop now, I don't have any other pending char-misc patches at the moment. Acked-by: Greg Kroah-Hartman thanks, greg k-h