Updated from Linux LTS 3.10.23 to 3.10.24
This commit is contained in:
@@ -198,6 +198,13 @@ static void enclosure_remove_links(struct enclosure_component *cdev)
|
||||
{
|
||||
char name[ENCLOSURE_NAME_SIZE];
|
||||
|
||||
/*
|
||||
* In odd circumstances, like multipath devices, something else may
|
||||
* already have removed the links, so check for this condition first.
|
||||
*/
|
||||
if (!cdev->dev->kobj.sd)
|
||||
return;
|
||||
|
||||
enclosure_link_name(cdev, name);
|
||||
sysfs_remove_link(&cdev->dev->kobj, name);
|
||||
sysfs_remove_link(&cdev->cdev.kobj, "device");
|
||||
|
||||
@@ -109,8 +109,12 @@
|
||||
#define MEI_DEV_ID_PPT_2 0x1CBA /* Panther Point */
|
||||
#define MEI_DEV_ID_PPT_3 0x1DBA /* Panther Point */
|
||||
|
||||
#define MEI_DEV_ID_LPT 0x8C3A /* Lynx Point */
|
||||
#define MEI_DEV_ID_LPT_H 0x8C3A /* Lynx Point H */
|
||||
#define MEI_DEV_ID_LPT_W 0x8D3A /* Lynx Point - Wellsburg */
|
||||
#define MEI_DEV_ID_LPT_LP 0x9C3A /* Lynx Point LP */
|
||||
#define MEI_DEV_ID_LPT_HR 0x8CBA /* Lynx Point H Refresh */
|
||||
|
||||
#define MEI_DEV_ID_WPT_LP 0x9CBA /* Wildcat Point LP */
|
||||
/*
|
||||
* MEI HW Section
|
||||
*/
|
||||
|
||||
@@ -79,8 +79,11 @@ static DEFINE_PCI_DEVICE_TABLE(mei_me_pci_tbl) = {
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_1)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_2)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_3)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_H)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_W)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_LP)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_HR)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_WPT_LP)},
|
||||
|
||||
/* required last entry */
|
||||
{0, }
|
||||
|
||||
Reference in New Issue
Block a user