]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
iwlwifi: dont use pci_dev before it being assign
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Tue, 9 Nov 2010 02:45:21 +0000 (18:45 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 9 Nov 2010 19:25:46 +0000 (14:25 -0500)
In order to use build-in debugging macro, pci_dev in priv need to be
assigned first.

This fix iwl3945 driver oopsed at boot with 2.6.37-rc1

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl3945-base.c

index 8f8c4b73f8b9667a245f764360058be740f38b03..7edf8c2fb8c7c6072294854281ba40f416f1423a 100644 (file)
@@ -4000,7 +4000,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         * "the hard way", rather than using device's scan.
         */
        if (iwl3945_mod_params.disable_hw_scan) {
         * "the hard way", rather than using device's scan.
         */
        if (iwl3945_mod_params.disable_hw_scan) {
-               IWL_ERR(priv, "sw scan support is deprecated\n");
+               dev_printk(KERN_DEBUG, &(pdev->dev),
+                       "sw scan support is deprecated\n");
                iwl3945_hw_ops.hw_scan = NULL;
        }
 
                iwl3945_hw_ops.hw_scan = NULL;
        }