diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/osl.c | 4 | ||||
-rw-r--r-- | drivers/ata/ata_piix.c | 2 | ||||
-rw-r--r-- | drivers/firewire/ohci.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_bufs.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba6120.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba7220.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/hfc4s8s_l1.c | 2 | ||||
-rw-r--r-- | drivers/macintosh/windfarm_pm81.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/friio-fe.c | 2 | ||||
-rw-r--r-- | drivers/net/smsc911x.c | 4 | ||||
-rw-r--r-- | drivers/pci/hotplug/cpqphp_core.c | 2 | ||||
-rw-r--r-- | drivers/pci/pci.c | 2 | ||||
-rw-r--r-- | drivers/ps3/ps3-sys-manager.c | 2 | ||||
-rw-r--r-- | drivers/regulator/core.c | 2 | ||||
-rw-r--r-- | drivers/s390/char/sclp_cpi_sys.c | 2 | ||||
-rw-r--r-- | drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 2 | ||||
-rw-r--r-- | drivers/scsi/bfa/include/defs/bfa_defs_status.h | 4 | ||||
-rw-r--r-- | drivers/spi/spi_mpc8xxx.c | 2 | ||||
-rw-r--r-- | drivers/virtio/virtio_pci.c | 2 |
20 files changed, 24 insertions, 24 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 8e6d8665f0ae..f92531fbd501 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -1405,7 +1405,7 @@ acpi_os_invalidate_address( | |||
1405 | switch (space_id) { | 1405 | switch (space_id) { |
1406 | case ACPI_ADR_SPACE_SYSTEM_IO: | 1406 | case ACPI_ADR_SPACE_SYSTEM_IO: |
1407 | case ACPI_ADR_SPACE_SYSTEM_MEMORY: | 1407 | case ACPI_ADR_SPACE_SYSTEM_MEMORY: |
1408 | /* Only interference checks against SystemIO and SytemMemory | 1408 | /* Only interference checks against SystemIO and SystemMemory |
1409 | are needed */ | 1409 | are needed */ |
1410 | res.start = address; | 1410 | res.start = address; |
1411 | res.end = address + length - 1; | 1411 | res.end = address + length - 1; |
@@ -1457,7 +1457,7 @@ acpi_os_validate_address ( | |||
1457 | switch (space_id) { | 1457 | switch (space_id) { |
1458 | case ACPI_ADR_SPACE_SYSTEM_IO: | 1458 | case ACPI_ADR_SPACE_SYSTEM_IO: |
1459 | case ACPI_ADR_SPACE_SYSTEM_MEMORY: | 1459 | case ACPI_ADR_SPACE_SYSTEM_MEMORY: |
1460 | /* Only interference checks against SystemIO and SytemMemory | 1460 | /* Only interference checks against SystemIO and SystemMemory |
1461 | are needed */ | 1461 | are needed */ |
1462 | res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL); | 1462 | res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL); |
1463 | if (!res) | 1463 | if (!res) |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index c33806654e46..b1cb8af6af1c 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -43,7 +43,7 @@ | |||
43 | * driver the list of errata that are relevant is below, going back to | 43 | * driver the list of errata that are relevant is below, going back to |
44 | * PIIX4. Older device documentation is now a bit tricky to find. | 44 | * PIIX4. Older device documentation is now a bit tricky to find. |
45 | * | 45 | * |
46 | * The chipsets all follow very much the same design. The orginal Triton | 46 | * The chipsets all follow very much the same design. The original Triton |
47 | * series chipsets do _not_ support independant device timings, but this | 47 | * series chipsets do _not_ support independant device timings, but this |
48 | * is fixed in Triton II. With the odd mobile exception the chips then | 48 | * is fixed in Triton II. With the odd mobile exception the chips then |
49 | * change little except in gaining more modes until SATA arrives. This | 49 | * change little except in gaining more modes until SATA arrives. This |
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 75dc6988cffd..8e180a27be7c 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
@@ -1342,7 +1342,7 @@ static void bus_reset_tasklet(unsigned long data) | |||
1342 | * was set up before this reset, the old one is now no longer | 1342 | * was set up before this reset, the old one is now no longer |
1343 | * in use and we can free it. Update the config rom pointers | 1343 | * in use and we can free it. Update the config rom pointers |
1344 | * to point to the current config rom and clear the | 1344 | * to point to the current config rom and clear the |
1345 | * next_config_rom pointer so a new udpate can take place. | 1345 | * next_config_rom pointer so a new update can take place. |
1346 | */ | 1346 | */ |
1347 | 1347 | ||
1348 | if (ohci->next_config_rom != NULL) { | 1348 | if (ohci->next_config_rom != NULL) { |
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 8417cc4c43f1..8475d58f2a33 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c | |||
@@ -960,7 +960,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) | |||
960 | dma->buflist[i + dma->buf_count] = &entry->buflist[i]; | 960 | dma->buflist[i + dma->buf_count] = &entry->buflist[i]; |
961 | } | 961 | } |
962 | 962 | ||
963 | /* No allocations failed, so now we can replace the orginal pagelist | 963 | /* No allocations failed, so now we can replace the original pagelist |
964 | * with the new one. | 964 | * with the new one. |
965 | */ | 965 | */ |
966 | if (dma->page_count) { | 966 | if (dma->page_count) { |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c index 37d12e5efa49..1d7aea132a09 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c | |||
@@ -1474,7 +1474,7 @@ static void ipath_ht_quiet_serdes(struct ipath_devdata *dd) | |||
1474 | /** | 1474 | /** |
1475 | * ipath_pe_put_tid - write a TID in chip | 1475 | * ipath_pe_put_tid - write a TID in chip |
1476 | * @dd: the infinipath device | 1476 | * @dd: the infinipath device |
1477 | * @tidptr: pointer to the expected TID (in chip) to udpate | 1477 | * @tidptr: pointer to the expected TID (in chip) to update |
1478 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected | 1478 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected |
1479 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing | 1479 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing |
1480 | * | 1480 | * |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c index fbf8c5379ea8..4b4a30b0dabd 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6120.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c | |||
@@ -1328,7 +1328,7 @@ bail: | |||
1328 | /** | 1328 | /** |
1329 | * ipath_pe_put_tid - write a TID in chip | 1329 | * ipath_pe_put_tid - write a TID in chip |
1330 | * @dd: the infinipath device | 1330 | * @dd: the infinipath device |
1331 | * @tidptr: pointer to the expected TID (in chip) to udpate | 1331 | * @tidptr: pointer to the expected TID (in chip) to update |
1332 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected | 1332 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected |
1333 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing | 1333 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing |
1334 | * | 1334 | * |
@@ -1394,7 +1394,7 @@ static void ipath_pe_put_tid(struct ipath_devdata *dd, u64 __iomem *tidptr, | |||
1394 | /** | 1394 | /** |
1395 | * ipath_pe_put_tid_2 - write a TID in chip, Revision 2 or higher | 1395 | * ipath_pe_put_tid_2 - write a TID in chip, Revision 2 or higher |
1396 | * @dd: the infinipath device | 1396 | * @dd: the infinipath device |
1397 | * @tidptr: pointer to the expected TID (in chip) to udpate | 1397 | * @tidptr: pointer to the expected TID (in chip) to update |
1398 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected | 1398 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected |
1399 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing | 1399 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing |
1400 | * | 1400 | * |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba7220.c b/drivers/infiniband/hw/ipath/ipath_iba7220.c index a805402dd4ae..34b778ed97fc 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba7220.c +++ b/drivers/infiniband/hw/ipath/ipath_iba7220.c | |||
@@ -1738,7 +1738,7 @@ bail: | |||
1738 | /** | 1738 | /** |
1739 | * ipath_7220_put_tid - write a TID to the chip | 1739 | * ipath_7220_put_tid - write a TID to the chip |
1740 | * @dd: the infinipath device | 1740 | * @dd: the infinipath device |
1741 | * @tidptr: pointer to the expected TID (in chip) to udpate | 1741 | * @tidptr: pointer to the expected TID (in chip) to update |
1742 | * @tidtype: 0 for eager, 1 for expected | 1742 | * @tidtype: 0 for eager, 1 for expected |
1743 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing | 1743 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing |
1744 | * | 1744 | * |
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c index ab98e135bcbb..7ea0d07836d6 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.c +++ b/drivers/isdn/hisax/hfc4s8s_l1.c | |||
@@ -309,7 +309,7 @@ wait_busy(hfc4s8s_hw * a) | |||
309 | 309 | ||
310 | /******************************************************/ | 310 | /******************************************************/ |
311 | /* function to read critical counter registers that */ | 311 | /* function to read critical counter registers that */ |
312 | /* may be udpated by the chip during read */ | 312 | /* may be updated by the chip during read */ |
313 | /******************************************************/ | 313 | /******************************************************/ |
314 | static u_char | 314 | static u_char |
315 | Read_hfc8_stable(hfc4s8s_hw * hw, int reg) | 315 | Read_hfc8_stable(hfc4s8s_hw * hw, int reg) |
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c index 565d5b2adc95..129cda737880 100644 --- a/drivers/macintosh/windfarm_pm81.c +++ b/drivers/macintosh/windfarm_pm81.c | |||
@@ -188,7 +188,7 @@ struct wf_smu_sys_fans_state { | |||
188 | }; | 188 | }; |
189 | 189 | ||
190 | /* | 190 | /* |
191 | * Configs for SMU Sytem Fan control loop | 191 | * Configs for SMU System Fan control loop |
192 | */ | 192 | */ |
193 | static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = { | 193 | static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = { |
194 | /* Model ID 2 */ | 194 | /* Model ID 2 */ |
diff --git a/drivers/media/dvb/dvb-usb/friio-fe.c b/drivers/media/dvb/dvb-usb/friio-fe.c index d14bd227b502..93c21ddd0b77 100644 --- a/drivers/media/dvb/dvb-usb/friio-fe.c +++ b/drivers/media/dvb/dvb-usb/friio-fe.c | |||
@@ -300,7 +300,7 @@ static int jdvbt90502_set_frontend(struct dvb_frontend *fe, | |||
300 | struct dvb_frontend_parameters *p) | 300 | struct dvb_frontend_parameters *p) |
301 | { | 301 | { |
302 | /** | 302 | /** |
303 | * NOTE: ignore all the paramters except frequency. | 303 | * NOTE: ignore all the parameters except frequency. |
304 | * others should be fixed to the proper value for ISDB-T, | 304 | * others should be fixed to the proper value for ISDB-T, |
305 | * but don't check here. | 305 | * but don't check here. |
306 | */ | 306 | */ |
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 4fd1d8b38788..eb175980a8e0 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
@@ -737,7 +737,7 @@ static void smsc911x_phy_adjust_link(struct net_device *dev) | |||
737 | SMSC_TRACE(HW, "configuring for carrier OK"); | 737 | SMSC_TRACE(HW, "configuring for carrier OK"); |
738 | if ((pdata->gpio_orig_setting & GPIO_CFG_LED1_EN_) && | 738 | if ((pdata->gpio_orig_setting & GPIO_CFG_LED1_EN_) && |
739 | (!pdata->using_extphy)) { | 739 | (!pdata->using_extphy)) { |
740 | /* Restore orginal GPIO configuration */ | 740 | /* Restore original GPIO configuration */ |
741 | pdata->gpio_setting = pdata->gpio_orig_setting; | 741 | pdata->gpio_setting = pdata->gpio_orig_setting; |
742 | smsc911x_reg_write(pdata, GPIO_CFG, | 742 | smsc911x_reg_write(pdata, GPIO_CFG, |
743 | pdata->gpio_setting); | 743 | pdata->gpio_setting); |
@@ -751,7 +751,7 @@ static void smsc911x_phy_adjust_link(struct net_device *dev) | |||
751 | if ((pdata->gpio_setting & GPIO_CFG_LED1_EN_) && | 751 | if ((pdata->gpio_setting & GPIO_CFG_LED1_EN_) && |
752 | (!pdata->using_extphy)) { | 752 | (!pdata->using_extphy)) { |
753 | /* Force 10/100 LED off, after saving | 753 | /* Force 10/100 LED off, after saving |
754 | * orginal GPIO configuration */ | 754 | * original GPIO configuration */ |
755 | pdata->gpio_orig_setting = pdata->gpio_setting; | 755 | pdata->gpio_orig_setting = pdata->gpio_setting; |
756 | 756 | ||
757 | pdata->gpio_setting &= ~GPIO_CFG_LED1_EN_; | 757 | pdata->gpio_setting &= ~GPIO_CFG_LED1_EN_; |
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c index f184d1d2ecbe..6644337d63d6 100644 --- a/drivers/pci/hotplug/cpqphp_core.c +++ b/drivers/pci/hotplug/cpqphp_core.c | |||
@@ -848,7 +848,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
848 | goto err_disable_device; | 848 | goto err_disable_device; |
849 | } | 849 | } |
850 | 850 | ||
851 | /* Check for the proper subsytem ID's | 851 | /* Check for the proper subsystem ID's |
852 | * Intel uses a different SSID programming model than Compaq. | 852 | * Intel uses a different SSID programming model than Compaq. |
853 | * For Intel, each SSID bit identifies a PHP capability. | 853 | * For Intel, each SSID bit identifies a PHP capability. |
854 | * Also Intel HPC's may have RID=0. | 854 | * Also Intel HPC's may have RID=0. |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index cb1dd5f4988c..ddd55dc927f7 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1506,7 +1506,7 @@ int pci_prepare_to_sleep(struct pci_dev *dev) | |||
1506 | * pci_back_from_sleep - turn PCI device on during system-wide transition into working state | 1506 | * pci_back_from_sleep - turn PCI device on during system-wide transition into working state |
1507 | * @dev: Device to handle. | 1507 | * @dev: Device to handle. |
1508 | * | 1508 | * |
1509 | * Disable device's sytem wake-up capability and put it into D0. | 1509 | * Disable device's system wake-up capability and put it into D0. |
1510 | */ | 1510 | */ |
1511 | int pci_back_from_sleep(struct pci_dev *dev) | 1511 | int pci_back_from_sleep(struct pci_dev *dev) |
1512 | { | 1512 | { |
diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c index 3cbaf1811bd0..d37c445f0eda 100644 --- a/drivers/ps3/ps3-sys-manager.c +++ b/drivers/ps3/ps3-sys-manager.c | |||
@@ -119,7 +119,7 @@ enum ps3_sys_manager_service_id { | |||
119 | * enum ps3_sys_manager_attr - Notification attribute (bit position mask). | 119 | * enum ps3_sys_manager_attr - Notification attribute (bit position mask). |
120 | * @PS3_SM_ATTR_POWER: Power button. | 120 | * @PS3_SM_ATTR_POWER: Power button. |
121 | * @PS3_SM_ATTR_RESET: Reset button, not available on retail console. | 121 | * @PS3_SM_ATTR_RESET: Reset button, not available on retail console. |
122 | * @PS3_SM_ATTR_THERMAL: Sytem thermal alert. | 122 | * @PS3_SM_ATTR_THERMAL: System thermal alert. |
123 | * @PS3_SM_ATTR_CONTROLLER: Remote controller event. | 123 | * @PS3_SM_ATTR_CONTROLLER: Remote controller event. |
124 | * @PS3_SM_ATTR_ALL: Logical OR of all. | 124 | * @PS3_SM_ATTR_ALL: Logical OR of all. |
125 | * | 125 | * |
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index c7bbe30010f7..7461f5bb2bd8 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -1538,7 +1538,7 @@ EXPORT_SYMBOL_GPL(regulator_count_voltages); | |||
1538 | * Context: can sleep | 1538 | * Context: can sleep |
1539 | * | 1539 | * |
1540 | * Returns a voltage that can be passed to @regulator_set_voltage(), | 1540 | * Returns a voltage that can be passed to @regulator_set_voltage(), |
1541 | * zero if this selector code can't be used on this sytem, or a | 1541 | * zero if this selector code can't be used on this system, or a |
1542 | * negative errno. | 1542 | * negative errno. |
1543 | */ | 1543 | */ |
1544 | int regulator_list_voltage(struct regulator *regulator, unsigned selector) | 1544 | int regulator_list_voltage(struct regulator *regulator, unsigned selector) |
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c index 62c2647f37f4..4a51e3f09689 100644 --- a/drivers/s390/char/sclp_cpi_sys.c +++ b/drivers/s390/char/sclp_cpi_sys.c | |||
@@ -102,7 +102,7 @@ static struct sclp_req *cpi_prepare_req(void) | |||
102 | /* set system name */ | 102 | /* set system name */ |
103 | set_data(evb->system_name, system_name); | 103 | set_data(evb->system_name, system_name); |
104 | 104 | ||
105 | /* set sytem level */ | 105 | /* set system level */ |
106 | evb->system_level = system_level; | 106 | evb->system_level = system_level; |
107 | 107 | ||
108 | /* set sysplex name */ | 108 | /* set sysplex name */ |
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_cee.h b/drivers/scsi/bfa/include/defs/bfa_defs_cee.h index 520a22f52dd1..6217eec8c604 100644 --- a/drivers/scsi/bfa/include/defs/bfa_defs_cee.h +++ b/drivers/scsi/bfa/include/defs/bfa_defs_cee.h | |||
@@ -54,7 +54,7 @@ struct bfa_cee_lldp_str_s { | |||
54 | }; | 54 | }; |
55 | 55 | ||
56 | 56 | ||
57 | /* LLDP paramters */ | 57 | /* LLDP parameters */ |
58 | struct bfa_cee_lldp_cfg_s { | 58 | struct bfa_cee_lldp_cfg_s { |
59 | struct bfa_cee_lldp_str_s chassis_id; | 59 | struct bfa_cee_lldp_str_s chassis_id; |
60 | struct bfa_cee_lldp_str_s port_id; | 60 | struct bfa_cee_lldp_str_s port_id; |
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_status.h b/drivers/scsi/bfa/include/defs/bfa_defs_status.h index cdceaeb9f4b8..03ce0331eb48 100644 --- a/drivers/scsi/bfa/include/defs/bfa_defs_status.h +++ b/drivers/scsi/bfa/include/defs/bfa_defs_status.h | |||
@@ -223,9 +223,9 @@ enum bfa_status { | |||
223 | BFA_STATUS_IM_PVID_NON_ZERO = 140, /* Port VLAN ID (PVID) is Set to | 223 | BFA_STATUS_IM_PVID_NON_ZERO = 140, /* Port VLAN ID (PVID) is Set to |
224 | * Non-Zero Value */ | 224 | * Non-Zero Value */ |
225 | BFA_STATUS_IM_INETCFG_LOCK_FAILED = 141, /* Acquiring Network | 225 | BFA_STATUS_IM_INETCFG_LOCK_FAILED = 141, /* Acquiring Network |
226 | * Subsytem Lock Failed.Please | 226 | * Subsystem Lock Failed.Please |
227 | * try after some time */ | 227 | * try after some time */ |
228 | BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /* Acquiring Network Subsytem | 228 | BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /* Acquiring Network Subsystem |
229 | * handle Failed. Please try | 229 | * handle Failed. Please try |
230 | * after some time */ | 230 | * after some time */ |
231 | BFA_STATUS_IM_NOT_BOUND = 143, /* Brocade 10G Ethernet Service is not | 231 | BFA_STATUS_IM_NOT_BOUND = 143, /* Brocade 10G Ethernet Service is not |
diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c index 4f0cc9d457e0..56efdfe1428d 100644 --- a/drivers/spi/spi_mpc8xxx.c +++ b/drivers/spi/spi_mpc8xxx.c | |||
@@ -639,7 +639,7 @@ static int mpc8xxx_spi_setup(struct spi_device *spi) | |||
639 | } | 639 | } |
640 | mpc8xxx_spi = spi_master_get_devdata(spi->master); | 640 | mpc8xxx_spi = spi_master_get_devdata(spi->master); |
641 | 641 | ||
642 | hw_mode = cs->hw_mode; /* Save orginal settings */ | 642 | hw_mode = cs->hw_mode; /* Save original settings */ |
643 | cs->hw_mode = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->mode); | 643 | cs->hw_mode = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->mode); |
644 | /* mask out bits we are going to set */ | 644 | /* mask out bits we are going to set */ |
645 | cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH | 645 | cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH |
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 625447f645d9..7210c0d72e43 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c | |||
@@ -654,7 +654,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev, | |||
654 | /* we use the subsystem vendor/device id as the virtio vendor/device | 654 | /* we use the subsystem vendor/device id as the virtio vendor/device |
655 | * id. this allows us to use the same PCI vendor/device id for all | 655 | * id. this allows us to use the same PCI vendor/device id for all |
656 | * virtio devices and to identify the particular virtio driver by | 656 | * virtio devices and to identify the particular virtio driver by |
657 | * the subsytem ids */ | 657 | * the subsystem ids */ |
658 | vp_dev->vdev.id.vendor = pci_dev->subsystem_vendor; | 658 | vp_dev->vdev.id.vendor = pci_dev->subsystem_vendor; |
659 | vp_dev->vdev.id.device = pci_dev->subsystem_device; | 659 | vp_dev->vdev.id.device = pci_dev->subsystem_device; |
660 | 660 | ||