diff --git a/[refs] b/[refs] index ed7fe1ae83ab..833f4c49a74f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9443f401bb20ae6414e3e68bca0413bad28b689 +refs/heads/master: e9bf1040f649d89db3c2e060d1b0b56665a4fb93 diff --git a/trunk/drivers/pci/search.c b/trunk/drivers/pci/search.c index 9148b6e8056b..d84a2f8cc12a 100644 --- a/trunk/drivers/pci/search.c +++ b/trunk/drivers/pci/search.c @@ -252,15 +252,6 @@ struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, .subdevice = ss_device, }; - /* - * pci_find_subsys() can be called on the ide_setup() path, - * super-early in boot. But the down_read() will enable local - * interrupts, which can cause some machines to crash. So here we - * detect and flag that situation and bail out early. - */ - if (unlikely(no_pci_devices())) - return NULL; - return pci_get_dev_by_id(&id, from); }