← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/mtd/chips/gen_probe.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/mtd/chips/gen_probe.c
155
155
                        pchip->start = (i << cfi.chipshift);
156
156
                        pchip->state = FL_READY;
157
157
                        init_waitqueue_head(&pchip->wq);
158
 
                        spin_lock_init(&pchip->_spinlock);
159
 
                        pchip->mutex = &pchip->_spinlock;
 
158
                        mutex_init(&pchip->mutex);
160
159
                }
161
160
        }
162
161
 
242
241
                /* We need these for the !CONFIG_MODULES case,
243
242
                   because symbol_get() doesn't work there */
244
243
#ifdef CONFIG_MTD_CFI_INTELEXT
245
 
        case 0x0001:
246
 
        case 0x0003:
247
 
        case 0x0200:
 
244
        case P_ID_INTEL_EXT:
 
245
        case P_ID_INTEL_STD:
 
246
        case P_ID_INTEL_PERFORMANCE:
248
247
                return cfi_cmdset_0001(map, primary);
249
248
#endif
250
249
#ifdef CONFIG_MTD_CFI_AMDSTD
251
 
        case 0x0002:
 
250
        case P_ID_AMD_STD:
 
251
        case P_ID_SST_OLD:
 
252
        case P_ID_WINBOND:
252
253
                return cfi_cmdset_0002(map, primary);
253
254
#endif
254
255
#ifdef CONFIG_MTD_CFI_STAA
255
 
        case 0x0020:
 
256
        case P_ID_ST_ADV:
256
257
                return cfi_cmdset_0020(map, primary);
257
258
#endif
258
259
        default: