From: Jiri Slaby Date: Thu, 4 Apr 2013 19:34:11 +0000 (+0200) Subject: MFD: rtsx_pcr: Fix probe fail path X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~31^2~86 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d66b568a215fe2da2a9db736ebf9b8d66082d88;p=pandora-kernel.git MFD: rtsx_pcr: Fix probe fail path When rtsx_pci_acquire_irq fails in rtsx_pci_probe, we forget to disable an MSI (if we enabled it). This results in this warning on the next attempt to load the module: WARNING: at drivers/pci/msi.c:834 pci_enable_msi_block+0x2a4/0x2b0() Hardware name: HP EliteBook 840 G1 Modules linked in: rtsx_pci(+) ... Pid: 4056, comm: modprobe Tainted: G I 3.8.0-9405-gd895cb1-1-vanilla #1 Call Trace: [] warn_slowpath_common+0x7a/0xc0 [] warn_slowpath_null+0x15/0x20 [] pci_enable_msi_block+0x2a4/0x2b0 [] rtsx_pci_probe+0x55a/0x720 [rtsx_pci] ... So properly disable MSI in that case. Signed-off-by: Jiri Slaby Signed-off-by: Samuel Ortiz --- Reading git-diff-tree failed