From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754032Ab3AJPc1 (ORCPT ); Thu, 10 Jan 2013 10:32:27 -0500 Received: from mga09.intel.com ([134.134.136.24]:38415 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753679Ab3AJPc0 (ORCPT ); Thu, 10 Jan 2013 10:32:26 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,444,1355126400"; d="scan'208";a="244669286" From: Tomas Winkler To: gregkh@linuxfoundation.org Cc: arnd@arndb.de, alan@linux.intel.com, linux-kernel@vger.kernel.org, sedat.dilek@gmail.com, Tomas Winkler Subject: [char-misc-next V2] mei: drop the warning when cl is not initialized during unlinking Date: Thu, 10 Jan 2013 17:32:14 +0200 Message-Id: <1357831934-31610-1-git-send-email-tomas.winkler@intel.com> X-Mailer: git-send-email 1.7.4.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On systems where wd and amthif is not initialized we will hit cl->dev == NULL. This condition is okay so we don't need to be laud about it. Fixes the follwing warning during suspend [ 137.061985] WARNING: at drivers/misc/mei/client.c:315 mei_cl_unlink+0x86/0x90 [mei]() [ 137.061986] Hardware name: 530U3BI/530U4BI/530U4BH [ 137.062140] Modules linked in: snd_hda_codec_hdmi snd_hda_codec_realtek joydev coretemp kvm_intel snd_hda_intel snd_hda_codec kvm arc4 iwldvm snd_hwdep i915 snd_pcm mac80211 ghash_clmulni_intel snd_page_alloc aesni_intel snd_seq_midi xts snd_seq_midi_event aes_x86_64 rfcomm snd_rawmidi parport_pc bnep lrw snd_seq uvcvideo i2c_algo_bit ppdev gf128mul iwlwifi snd_timer drm_kms_helper ablk_helper cryptd drm snd_seq_device videobuf2_vmalloc psmouse videobuf2_memops snd cfg80211 btusb videobuf2_core soundcore videodev lp bluetooth samsung_laptop wmi microcode mei serio_raw mac_hid video hid_generic lpc_ich parport usbhid hid r8169 [ 137.062143] Pid: 2706, comm: kworker/u:15 Tainted: G D W 3.8.0-rc2-next20130109-1-iniza-generic #1 [ 137.062144] Call Trace: [ 137.062156] [] warn_slowpath_common+0x7f/0xc0 [ 137.062159] [] ? ioread32+0x3a/0x40 [ 137.062162] [] warn_slowpath_null+0x1a/0x20 [ 137.062168] [] mei_cl_unlink+0x86/0x90 [mei] [ 137.062173] [] mei_reset+0xc5/0x240 [mei] [ 137.062178] [] mei_pci_resume+0xa3/0x110 [mei] [ 137.062183] [] pci_pm_resume+0x7e/0xe0 [ 137.062185] [] ? pci_pm_thaw+0x80/0x80 [ 137.062189] [] dpm_run_callback.isra.6+0x25/0x50 [ 137.062192] [] device_resume+0x9f/0x140 [ 137.062194] [] async_resume+0x21/0x50 [ 137.062200] [] async_run_entry_fn+0x90/0x1c0 [ 137.062203] [] process_one_work+0x155/0x460 [ 137.062207] [] worker_thread+0x168/0x400 [ 137.062210] [] ? manage_workers+0x2b0/0x2b0 [ 137.062214] [] kthread+0xc0/0xd0 [ 137.062218] [] ? flush_kthread_worker+0xb0/0xb0 [ 137.062222] [] ret_from_fork+0x7c/0xb0 [ 137.062228] [] ? flush_kthread_worker+0xb0/0xb0 Reported-by: Sedat Dilek Tested-by: Sedat Dilek Signed-off-by: Tomas Winkler --- V2: fix a typo in the comment drivers/misc/mei/client.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c index d566dd8..a921001 100644 --- a/drivers/misc/mei/client.c +++ b/drivers/misc/mei/client.c @@ -312,8 +312,9 @@ int mei_cl_unlink(struct mei_cl *cl) if (!cl) return 0; - if (WARN_ON(!cl->dev)) - return -EINVAL; + /* wd and amthif might not be initialized */ + if (!cl->dev) + return 0; dev = cl->dev; -- 1.7.4.4