diff options
-rw-r--r-- | arch/arm/kernel/kprobes-test.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mm/sram-alloc.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/hfcpci.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/hfc_pci.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/hfc_sx.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/tcm_usb_gadget.c | 2 | ||||
-rw-r--r-- | drivers/vhost/tcm_vhost.c | 2 | ||||
-rw-r--r-- | drivers/xen/xen-pciback/pci_stub.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/kernel/kprobes-test.c b/arch/arm/kernel/kprobes-test.c index 1862d8f2fd44..0cd63d080c7b 100644 --- a/arch/arm/kernel/kprobes-test.c +++ b/arch/arm/kernel/kprobes-test.c | |||
@@ -1598,7 +1598,7 @@ static int __init run_all_tests(void) | |||
1598 | { | 1598 | { |
1599 | int ret = 0; | 1599 | int ret = 0; |
1600 | 1600 | ||
1601 | pr_info("Begining kprobe tests...\n"); | 1601 | pr_info("Beginning kprobe tests...\n"); |
1602 | 1602 | ||
1603 | #ifndef CONFIG_THUMB2_KERNEL | 1603 | #ifndef CONFIG_THUMB2_KERNEL |
1604 | 1604 | ||
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c index 342e378da1ec..1f3b3ef3e103 100644 --- a/arch/blackfin/mm/sram-alloc.c +++ b/arch/blackfin/mm/sram-alloc.c | |||
@@ -191,7 +191,7 @@ static irqreturn_t l2_ecc_err(int irq, void *dev_id) | |||
191 | { | 191 | { |
192 | int status; | 192 | int status; |
193 | 193 | ||
194 | printk(KERN_ERR "L2 ecc error happend\n"); | 194 | printk(KERN_ERR "L2 ecc error happened\n"); |
195 | status = bfin_read32(L2CTL0_STAT); | 195 | status = bfin_read32(L2CTL0_STAT); |
196 | if (status & 0x1) | 196 | if (status & 0x1) |
197 | printk(KERN_ERR "Core channel error type:0x%x, addr:0x%x\n", | 197 | printk(KERN_ERR "Core channel error type:0x%x, addr:0x%x\n", |
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c index 81363ffa5357..6e99d73563b8 100644 --- a/drivers/isdn/hardware/mISDN/hfcpci.c +++ b/drivers/isdn/hardware/mISDN/hfcpci.c | |||
@@ -490,7 +490,7 @@ receive_dmsg(struct hfc_pci *hc) | |||
490 | (df->data[le16_to_cpu(zp->z1)])) { | 490 | (df->data[le16_to_cpu(zp->z1)])) { |
491 | if (dch->debug & DEBUG_HW) | 491 | if (dch->debug & DEBUG_HW) |
492 | printk(KERN_DEBUG | 492 | printk(KERN_DEBUG |
493 | "empty_fifo hfcpci paket inv. len " | 493 | "empty_fifo hfcpci packet inv. len " |
494 | "%d or crc %d\n", | 494 | "%d or crc %d\n", |
495 | rcnt, | 495 | rcnt, |
496 | df->data[le16_to_cpu(zp->z1)]); | 496 | df->data[le16_to_cpu(zp->z1)]); |
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c index 334fa90bed8e..f60d4be58941 100644 --- a/drivers/isdn/hisax/hfc_pci.c +++ b/drivers/isdn/hisax/hfc_pci.c | |||
@@ -354,7 +354,7 @@ receive_dmsg(struct IsdnCardState *cs) | |||
354 | if ((rcnt > MAX_DFRAME_LEN + 3) || (rcnt < 4) || | 354 | if ((rcnt > MAX_DFRAME_LEN + 3) || (rcnt < 4) || |
355 | (df->data[zp->z1])) { | 355 | (df->data[zp->z1])) { |
356 | if (cs->debug & L1_DEB_WARN) | 356 | if (cs->debug & L1_DEB_WARN) |
357 | debugl1(cs, "empty_fifo hfcpci paket inv. len %d or crc %d", rcnt, df->data[zp->z1]); | 357 | debugl1(cs, "empty_fifo hfcpci packet inv. len %d or crc %d", rcnt, df->data[zp->z1]); |
358 | #ifdef ERROR_STATISTIC | 358 | #ifdef ERROR_STATISTIC |
359 | cs->err_rx++; | 359 | cs->err_rx++; |
360 | #endif | 360 | #endif |
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c index 4db846be4369..4ec279ce052f 100644 --- a/drivers/isdn/hisax/hfc_sx.c +++ b/drivers/isdn/hisax/hfc_sx.c | |||
@@ -270,7 +270,7 @@ read_fifo(struct IsdnCardState *cs, u_char fifo, int trans_max) | |||
270 | 270 | ||
271 | if ((count > fifo_size) || (count < 4)) { | 271 | if ((count > fifo_size) || (count < 4)) { |
272 | if (cs->debug & L1_DEB_WARN) | 272 | if (cs->debug & L1_DEB_WARN) |
273 | debugl1(cs, "hfcsx_read_fifo %d paket inv. len %d ", fifo , count); | 273 | debugl1(cs, "hfcsx_read_fifo %d packet inv. len %d ", fifo , count); |
274 | while (count) { | 274 | while (count) { |
275 | count--; /* empty fifo */ | 275 | count--; /* empty fifo */ |
276 | Read_hfc(cs, HFCSX_FIF_DRD); | 276 | Read_hfc(cs, HFCSX_FIF_DRD); |
diff --git a/drivers/usb/gadget/tcm_usb_gadget.c b/drivers/usb/gadget/tcm_usb_gadget.c index 97e68b38cfdf..384921841598 100644 --- a/drivers/usb/gadget/tcm_usb_gadget.c +++ b/drivers/usb/gadget/tcm_usb_gadget.c | |||
@@ -1384,7 +1384,7 @@ static struct se_node_acl *usbg_alloc_fabric_acl(struct se_portal_group *se_tpg) | |||
1384 | 1384 | ||
1385 | nacl = kzalloc(sizeof(struct usbg_nacl), GFP_KERNEL); | 1385 | nacl = kzalloc(sizeof(struct usbg_nacl), GFP_KERNEL); |
1386 | if (!nacl) { | 1386 | if (!nacl) { |
1387 | printk(KERN_ERR "Unable to alocate struct usbg_nacl\n"); | 1387 | printk(KERN_ERR "Unable to allocate struct usbg_nacl\n"); |
1388 | return NULL; | 1388 | return NULL; |
1389 | } | 1389 | } |
1390 | 1390 | ||
diff --git a/drivers/vhost/tcm_vhost.c b/drivers/vhost/tcm_vhost.c index aa31692064dd..509ed1ab03ef 100644 --- a/drivers/vhost/tcm_vhost.c +++ b/drivers/vhost/tcm_vhost.c | |||
@@ -231,7 +231,7 @@ static struct se_node_acl *tcm_vhost_alloc_fabric_acl( | |||
231 | 231 | ||
232 | nacl = kzalloc(sizeof(struct tcm_vhost_nacl), GFP_KERNEL); | 232 | nacl = kzalloc(sizeof(struct tcm_vhost_nacl), GFP_KERNEL); |
233 | if (!nacl) { | 233 | if (!nacl) { |
234 | pr_err("Unable to alocate struct tcm_vhost_nacl\n"); | 234 | pr_err("Unable to allocate struct tcm_vhost_nacl\n"); |
235 | return NULL; | 235 | return NULL; |
236 | } | 236 | } |
237 | 237 | ||
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c index 961d664e2d2f..68dcc59cd287 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c | |||
@@ -360,7 +360,7 @@ static int __devinit pcistub_init_device(struct pci_dev *dev) | |||
360 | if (!dev_data->pci_saved_state) | 360 | if (!dev_data->pci_saved_state) |
361 | dev_err(&dev->dev, "Could not store PCI conf saved state!\n"); | 361 | dev_err(&dev->dev, "Could not store PCI conf saved state!\n"); |
362 | else { | 362 | else { |
363 | dev_dbg(&dev->dev, "reseting (FLR, D3, etc) the device\n"); | 363 | dev_dbg(&dev->dev, "resetting (FLR, D3, etc) the device\n"); |
364 | __pci_reset_function_locked(dev); | 364 | __pci_reset_function_locked(dev); |
365 | pci_restore_state(dev); | 365 | pci_restore_state(dev); |
366 | } | 366 | } |