aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
commit9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch)
tree15c4222de2a2b2814c9430dcb4e997b18597881c /drivers
parent7c2db36e730ee4facd341679ecb21ee73ba92831 (diff)
parentdf63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Assorted tiny fixes queued in trivial tree" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits) DocBook: update EXPORT_SYMBOL entry to point at export.h Documentation: update top level 00-INDEX file with new additions ARM: at91/ide: remove unsused at91-ide Kconfig entry percpu_counter.h: comment code for better readability x86, efi: fix comment typo in head_32.S IB: cxgb3: delay freeing mem untill entirely done with it net: mvneta: remove unneeded version.h include time: x86: report_lost_ticks doesn't exist any more pcmcia: avoid static analysis complaint about use-after-free fs/jfs: Fix typo in comment : 'how may' -> 'how many' of: add missing documentation for of_platform_populate() btrfs: remove unnecessary cur_trans set before goto loop in join_transaction sound: soc: Fix typo in sound/codecs treewide: Fix typo in various drivers btrfs: fix comment typos Update ibmvscsi module name in Kconfig. powerpc: fix typo (utilties -> utilities) of: fix spelling mistake in comment h8300: Fix home page URL in h8300/README xtensa: Fix home page URL in Kconfig ...
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bluetooth/ath3k.c2
-rw-r--r--drivers/devfreq/exynos4_bus.c2
-rw-r--r--drivers/firewire/ohci.c2
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c2
-rw-r--r--drivers/hid/Kconfig2
-rw-r--r--drivers/ide/Kconfig5
-rw-r--r--drivers/infiniband/hw/cxgb3/iwch_provider.c2
-rw-r--r--drivers/isdn/hardware/eicon/divacapi.h6
-rw-r--r--drivers/isdn/hardware/eicon/pc.h4
-rw-r--r--drivers/isdn/mISDN/l1oip_core.c2
-rw-r--r--drivers/media/platform/soc_camera/mx2_camera.c2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c2
-rw-r--r--drivers/net/ethernet/marvell/mvneta.c1
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/en_main.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c2
-rw-r--r--drivers/net/irda/ali-ircc.c2
-rw-r--r--drivers/of/address.c2
-rw-r--r--drivers/of/platform.c1
-rw-r--r--drivers/pcmcia/rsrc_nonstatic.c6
-rw-r--r--drivers/rpmsg/virtio_rpmsg_bus.c2
-rw-r--r--drivers/scsi/Kconfig2
-rw-r--r--drivers/staging/android/binder.h2
-rw-r--r--drivers/staging/octeon/ethernet.c2
-rw-r--r--drivers/target/sbp/sbp_target.c2
-rw-r--r--drivers/tty/ipwireless/hardware.c4
25 files changed, 29 insertions, 34 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 33c9a44a9678..a8a41e07a221 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -349,7 +349,7 @@ static int ath3k_load_syscfg(struct usb_device *udev)
349 349
350 ret = ath3k_get_state(udev, &fw_state); 350 ret = ath3k_get_state(udev, &fw_state);
351 if (ret < 0) { 351 if (ret < 0) {
352 BT_ERR("Can't get state to change to load configration err"); 352 BT_ERR("Can't get state to change to load configuration err");
353 return -EBUSY; 353 return -EBUSY;
354 } 354 }
355 355
diff --git a/drivers/devfreq/exynos4_bus.c b/drivers/devfreq/exynos4_bus.c
index 46d94e9e95b5..3f37f3b3f268 100644
--- a/drivers/devfreq/exynos4_bus.c
+++ b/drivers/devfreq/exynos4_bus.c
@@ -658,7 +658,7 @@ static int exynos4_bus_target(struct device *dev, unsigned long *_freq,
658 if (old_freq == freq) 658 if (old_freq == freq)
659 return 0; 659 return 0;
660 660
661 dev_dbg(dev, "targetting %lukHz %luuV\n", freq, new_oppinfo.volt); 661 dev_dbg(dev, "targeting %lukHz %luuV\n", freq, new_oppinfo.volt);
662 662
663 mutex_lock(&data->lock); 663 mutex_lock(&data->lock);
664 664
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 6ce6e07c38c1..45912e6e0ac2 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -329,7 +329,7 @@ module_param_named(quirks, param_quirks, int, 0644);
329MODULE_PARM_DESC(quirks, "Chip quirks (default = 0" 329MODULE_PARM_DESC(quirks, "Chip quirks (default = 0"
330 ", nonatomic cycle timer = " __stringify(QUIRK_CYCLE_TIMER) 330 ", nonatomic cycle timer = " __stringify(QUIRK_CYCLE_TIMER)
331 ", reset packet generation = " __stringify(QUIRK_RESET_PACKET) 331 ", reset packet generation = " __stringify(QUIRK_RESET_PACKET)
332 ", AR/selfID endianess = " __stringify(QUIRK_BE_HEADERS) 332 ", AR/selfID endianness = " __stringify(QUIRK_BE_HEADERS)
333 ", no 1394a enhancements = " __stringify(QUIRK_NO_1394A) 333 ", no 1394a enhancements = " __stringify(QUIRK_NO_1394A)
334 ", disable MSI = " __stringify(QUIRK_NO_MSI) 334 ", disable MSI = " __stringify(QUIRK_NO_MSI)
335 ", TI SLLZ059 erratum = " __stringify(QUIRK_TI_SLLZ059) 335 ", TI SLLZ059 erratum = " __stringify(QUIRK_TI_SLLZ059)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 9d4a2c2adf0e..32158d21c632 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1460,7 +1460,7 @@ static const char *swizzle_string(unsigned swizzle)
1460 case I915_BIT_6_SWIZZLE_9_10_17: 1460 case I915_BIT_6_SWIZZLE_9_10_17:
1461 return "bit9/bit10/bit17"; 1461 return "bit9/bit10/bit17";
1462 case I915_BIT_6_SWIZZLE_UNKNOWN: 1462 case I915_BIT_6_SWIZZLE_UNKNOWN:
1463 return "unkown"; 1463 return "unknown";
1464 } 1464 }
1465 1465
1466 return "bug"; 1466 return "bug";
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index e7d6a13ec6a6..eae0c7e468cf 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -320,7 +320,7 @@ config HID_LOGITECH_DJ
320 Say Y if you want support for Logitech Unifying receivers and devices. 320 Say Y if you want support for Logitech Unifying receivers and devices.
321 Unifying receivers are capable of pairing up to 6 Logitech compliant 321 Unifying receivers are capable of pairing up to 6 Logitech compliant
322 devices to the same receiver. Without this driver it will be handled by 322 devices to the same receiver. Without this driver it will be handled by
323 generic USB_HID driver and all incomming events will be multiplexed 323 generic USB_HID driver and all incoming events will be multiplexed
324 into a single mouse and a single keyboard device. 324 into a single mouse and a single keyboard device.
325 325
326config LOGITECH_FF 326config LOGITECH_FF
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 3c4417a1d438..02906ca99b41 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -700,11 +700,6 @@ config BLK_DEV_IDE_TX4939
700 depends on SOC_TX4939 700 depends on SOC_TX4939
701 select BLK_DEV_IDEDMA_SFF 701 select BLK_DEV_IDEDMA_SFF
702 702
703config BLK_DEV_IDE_AT91
704 tristate "Atmel AT91 (SAM9, CAP9, AT572D940HF) IDE support"
705 depends on ARM && ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_AT91X40
706 select IDE_TIMINGS
707
708config BLK_DEV_IDE_ICSIDE 703config BLK_DEV_IDE_ICSIDE
709 tristate "ICS IDE interface support" 704 tristate "ICS IDE interface support"
710 depends on ARM && ARCH_ACORN 705 depends on ARM && ARCH_ACORN
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index 0bdf09aa6f42..145d82a64d0a 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -783,8 +783,8 @@ static int iwch_dealloc_mw(struct ib_mw *mw)
783 mmid = (mw->rkey) >> 8; 783 mmid = (mw->rkey) >> 8;
784 cxio_deallocate_window(&rhp->rdev, mhp->attr.stag); 784 cxio_deallocate_window(&rhp->rdev, mhp->attr.stag);
785 remove_handle(rhp, &rhp->mmidr, mmid); 785 remove_handle(rhp, &rhp->mmidr, mmid);
786 kfree(mhp);
787 PDBG("%s ib_mw %p mmid 0x%x ptr %p\n", __func__, mw, mmid, mhp); 786 PDBG("%s ib_mw %p mmid 0x%x ptr %p\n", __func__, mw, mmid, mhp);
787 kfree(mhp);
788 return 0; 788 return 0;
789} 789}
790 790
diff --git a/drivers/isdn/hardware/eicon/divacapi.h b/drivers/isdn/hardware/eicon/divacapi.h
index 3942efbbfb58..a315a2914d70 100644
--- a/drivers/isdn/hardware/eicon/divacapi.h
+++ b/drivers/isdn/hardware/eicon/divacapi.h
@@ -422,11 +422,11 @@ struct _DIVA_CAPI_ADAPTER {
422#define LAPD 6 /* lapd (Q.921) */ 422#define LAPD 6 /* lapd (Q.921) */
423#define X25_L2 7 /* x.25 layer-2 */ 423#define X25_L2 7 /* x.25 layer-2 */
424#define V120_L2 8 /* V.120 layer-2 protocol */ 424#define V120_L2 8 /* V.120 layer-2 protocol */
425#define V42_IN 9 /* V.42 layer-2 protocol, incomming */ 425#define V42_IN 9 /* V.42 layer-2 protocol, incoming */
426#define V42 10 /* V.42 layer-2 protocol */ 426#define V42 10 /* V.42 layer-2 protocol */
427#define MDM_ATP 11 /* AT Parser built in the L2 */ 427#define MDM_ATP 11 /* AT Parser built in the L2 */
428#define X75_V42BIS 12 /* ISO7776 (X.75 SLP) modified to support V.42 bis compression */ 428#define X75_V42BIS 12 /* ISO7776 (X.75 SLP) modified to support V.42 bis compression */
429#define RTPL2_IN 13 /* RTP layer-2 protocol, incomming */ 429#define RTPL2_IN 13 /* RTP layer-2 protocol, incoming */
430#define RTPL2 14 /* RTP layer-2 protocol */ 430#define RTPL2 14 /* RTP layer-2 protocol */
431#define V120_V42BIS 15 /* V.120 layer-2 protocol supporting V.42 bis compression */ 431#define V120_V42BIS 15 /* V.120 layer-2 protocol supporting V.42 bis compression */
432 432
@@ -1125,7 +1125,7 @@ extern word li_total_channels;
1125 | Direction | word | Enable compression/decompression for | 1125 | Direction | word | Enable compression/decompression for |
1126 | | | 0: All direction | 1126 | | | 0: All direction |
1127 | | | 1: disable outgoing data | 1127 | | | 1: disable outgoing data |
1128 | | | 2: disable incomming data | 1128 | | | 2: disable incoming data |
1129 | | | 3: disable both direction (default) | 1129 | | | 3: disable both direction (default) |
1130 +---------------------+------+-----------------------------------------+ 1130 +---------------------+------+-----------------------------------------+
1131 | Number of code | word | Parameter P1 of V.42bis in accordance | 1131 | Number of code | word | Parameter P1 of V.42bis in accordance |
diff --git a/drivers/isdn/hardware/eicon/pc.h b/drivers/isdn/hardware/eicon/pc.h
index 889dc984bbca..329c0c26abfb 100644
--- a/drivers/isdn/hardware/eicon/pc.h
+++ b/drivers/isdn/hardware/eicon/pc.h
@@ -419,11 +419,11 @@ struct dual
419#define LAPD 6 /* lapd (Q.921) */ 419#define LAPD 6 /* lapd (Q.921) */
420#define X25_L2 7 /* x.25 layer-2 */ 420#define X25_L2 7 /* x.25 layer-2 */
421#define V120_L2 8 /* V.120 layer-2 protocol */ 421#define V120_L2 8 /* V.120 layer-2 protocol */
422#define V42_IN 9 /* V.42 layer-2 protocol, incomming */ 422#define V42_IN 9 /* V.42 layer-2 protocol, incoming */
423#define V42 10 /* V.42 layer-2 protocol */ 423#define V42 10 /* V.42 layer-2 protocol */
424#define MDM_ATP 11 /* AT Parser built in the L2 */ 424#define MDM_ATP 11 /* AT Parser built in the L2 */
425#define X75_V42BIS 12 /* x.75 with V.42bis */ 425#define X75_V42BIS 12 /* x.75 with V.42bis */
426#define RTPL2_IN 13 /* RTP layer-2 protocol, incomming */ 426#define RTPL2_IN 13 /* RTP layer-2 protocol, incoming */
427#define RTPL2 14 /* RTP layer-2 protocol */ 427#define RTPL2 14 /* RTP layer-2 protocol */
428#define V120_V42BIS 15 /* V.120 asynchronous mode supporting V.42bis compression */ 428#define V120_V42BIS 15 /* V.120 asynchronous mode supporting V.42bis compression */
429#define LISTENER 27 /* Layer 2 to listen line */ 429#define LISTENER 27 /* Layer 2 to listen line */
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index f8e405c383a0..2c0d2c2bf946 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -689,7 +689,7 @@ l1oip_socket_thread(void *data)
689 hc->sin_remote.sin_addr.s_addr = htonl(hc->remoteip); 689 hc->sin_remote.sin_addr.s_addr = htonl(hc->remoteip);
690 hc->sin_remote.sin_port = htons((unsigned short)hc->remoteport); 690 hc->sin_remote.sin_port = htons((unsigned short)hc->remoteport);
691 691
692 /* bind to incomming port */ 692 /* bind to incoming port */
693 if (socket->ops->bind(socket, (struct sockaddr *)&hc->sin_local, 693 if (socket->ops->bind(socket, (struct sockaddr *)&hc->sin_local,
694 sizeof(hc->sin_local))) { 694 sizeof(hc->sin_local))) {
695 printk(KERN_ERR "%s: Failed to bind socket to port %d.\n", 695 printk(KERN_ERR "%s: Failed to bind socket to port %d.\n",
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 1abdc7d9c744..4a574f3cfb2f 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -345,7 +345,7 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = {
345 /* 345 /*
346 * This is a generic configuration which is valid for most 346 * This is a generic configuration which is valid for most
347 * prp input-output format combinations. 347 * prp input-output format combinations.
348 * We set the incomming and outgoing pixelformat to a 348 * We set the incoming and outgoing pixelformat to a
349 * 16 Bit wide format and adjust the bytesperline 349 * 16 Bit wide format and adjust the bytesperline
350 * accordingly. With this configuration the inputdata 350 * accordingly. With this configuration the inputdata
351 * will not be changed by the emma and could be any type 351 * will not be changed by the emma and could be any type
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index c4daee1b7286..e81a747ea8ce 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -8843,7 +8843,7 @@ static void bnx2x_set_234_gates(struct bnx2x *bp, bool close)
8843 (!close) ? (val | HC_CONFIG_0_REG_BLOCK_DISABLE_0) : 8843 (!close) ? (val | HC_CONFIG_0_REG_BLOCK_DISABLE_0) :
8844 (val & ~(u32)HC_CONFIG_0_REG_BLOCK_DISABLE_0)); 8844 (val & ~(u32)HC_CONFIG_0_REG_BLOCK_DISABLE_0));
8845 } else { 8845 } else {
8846 /* Prevent incomming interrupts in IGU */ 8846 /* Prevent incoming interrupts in IGU */
8847 val = REG_RD(bp, IGU_REG_BLOCK_CONFIGURATION); 8847 val = REG_RD(bp, IGU_REG_BLOCK_CONFIGURATION);
8848 8848
8849 REG_WR(bp, IGU_REG_BLOCK_CONFIGURATION, 8849 REG_WR(bp, IGU_REG_BLOCK_CONFIGURATION,
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index b6025c305e10..cd345b8969bc 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -12,7 +12,6 @@
12 */ 12 */
13 13
14#include <linux/kernel.h> 14#include <linux/kernel.h>
15#include <linux/version.h>
16#include <linux/netdevice.h> 15#include <linux/netdevice.h>
17#include <linux/etherdevice.h> 16#include <linux/etherdevice.h>
18#include <linux/platform_device.h> 17#include <linux/platform_device.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index e3c3d122979e..b2cca58de910 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -64,7 +64,7 @@ static const char mlx4_en_version[] =
64 64
65/* Enable RSS UDP traffic */ 65/* Enable RSS UDP traffic */
66MLX4_EN_PARM_INT(udp_rss, 1, 66MLX4_EN_PARM_INT(udp_rss, 1,
67 "Enable RSS for incomming UDP traffic or disabled (0)"); 67 "Enable RSS for incoming UDP traffic or disabled (0)");
68 68
69/* Priority pausing */ 69/* Priority pausing */
70MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]." 70MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]."
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 5d5fd06c4b42..28a6d4838364 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1150,7 +1150,7 @@ static int qlcnic_check_npar_opertional(struct qlcnic_adapter *adapter)
1150 } 1150 }
1151 if (!npar_opt_timeo) { 1151 if (!npar_opt_timeo) {
1152 dev_err(&adapter->pdev->dev, 1152 dev_err(&adapter->pdev->dev,
1153 "Waiting for NPAR state to opertional timeout\n"); 1153 "Waiting for NPAR state to operational timeout\n");
1154 return -EIO; 1154 return -EIO;
1155 } 1155 }
1156 return 0; 1156 return 0;
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 84872043b5c6..9cea451a6081 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -993,7 +993,7 @@ static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud)
993 /* Enable Interuupt */ 993 /* Enable Interuupt */
994 self->ier = IER_EOM; // benjamin 2000/11/20 07:24PM 994 self->ier = IER_EOM; // benjamin 2000/11/20 07:24PM
995 995
996 /* Be ready for incomming frames */ 996 /* Be ready for incoming frames */
997 ali_ircc_dma_receive(self); // benajmin 2000/11/8 07:46PM not complete 997 ali_ircc_dma_receive(self); // benajmin 2000/11/8 07:46PM not complete
998 } 998 }
999 /* Go to SIR Speed */ 999 /* Go to SIR Speed */
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 0125524c08c4..04da786c84d2 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -429,7 +429,7 @@ static u64 __of_translate_address(struct device_node *dev,
429 goto bail; 429 goto bail;
430 bus = of_match_bus(parent); 430 bus = of_match_bus(parent);
431 431
432 /* Cound address cells & copy address locally */ 432 /* Count address cells & copy address locally */
433 bus->count_cells(dev, &na, &ns); 433 bus->count_cells(dev, &na, &ns);
434 if (!OF_CHECK_COUNTS(na, ns)) { 434 if (!OF_CHECK_COUNTS(na, ns)) {
435 printk(KERN_ERR "prom_parse: Bad cell count for %s\n", 435 printk(KERN_ERR "prom_parse: Bad cell count for %s\n",
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index b80891b43816..e0a6514ab46c 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -436,6 +436,7 @@ EXPORT_SYMBOL(of_platform_bus_probe);
436 * of_platform_populate() - Populate platform_devices from device tree data 436 * of_platform_populate() - Populate platform_devices from device tree data
437 * @root: parent of the first level to probe or NULL for the root of the tree 437 * @root: parent of the first level to probe or NULL for the root of the tree
438 * @matches: match table, NULL to use the default 438 * @matches: match table, NULL to use the default
439 * @lookup: auxdata table for matching id and platform_data with device nodes
439 * @parent: parent to hook devices from, NULL for toplevel 440 * @parent: parent to hook devices from, NULL for toplevel
440 * 441 *
441 * Similar to of_platform_bus_probe(), this function walks the device tree 442 * Similar to of_platform_bus_probe(), this function walks the device tree
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 430a9ac56091..065704c605d5 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -369,12 +369,12 @@ static int do_validate_mem(struct pcmcia_socket *s,
369 } 369 }
370 } 370 }
371 371
372 free_region(res2);
373 free_region(res1);
374
375 dev_dbg(&s->dev, "cs: memory probe 0x%06lx-0x%06lx: %p %p %u %u %u", 372 dev_dbg(&s->dev, "cs: memory probe 0x%06lx-0x%06lx: %p %p %u %u %u",
376 base, base+size-1, res1, res2, ret, info1, info2); 373 base, base+size-1, res1, res2, ret, info1, info2);
377 374
375 free_region(res2);
376 free_region(res1);
377
378 if ((ret) || (info1 != info2) || (info1 == 0)) 378 if ((ret) || (info1 != info2) || (info1 == 0))
379 return -EINVAL; 379 return -EINVAL;
380 380
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
index f1e323924f12..d85446021ddb 100644
--- a/drivers/rpmsg/virtio_rpmsg_bus.c
+++ b/drivers/rpmsg/virtio_rpmsg_bus.c
@@ -839,7 +839,7 @@ static void rpmsg_recv_done(struct virtqueue *rvq)
839 /* farewell, ept, we don't need you anymore */ 839 /* farewell, ept, we don't need you anymore */
840 kref_put(&ept->refcount, __ept_release); 840 kref_put(&ept->refcount, __ept_release);
841 } else 841 } else
842 dev_warn(dev, "msg received with no recepient\n"); 842 dev_warn(dev, "msg received with no recipient\n");
843 843
844 /* publish the real size of the buffer */ 844 /* publish the real size of the buffer */
845 sg_init_one(&sg, msg, RPMSG_BUF_SIZE); 845 sg_init_one(&sg, msg, RPMSG_BUF_SIZE);
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index d56b2534f3eb..db95c547c09d 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -883,7 +883,7 @@ config SCSI_IBMVSCSI
883 This is the IBM POWER Virtual SCSI Client 883 This is the IBM POWER Virtual SCSI Client
884 884
885 To compile this driver as a module, choose M here: the 885 To compile this driver as a module, choose M here: the
886 module will be called ibmvscsic. 886 module will be called ibmvscsi.
887 887
888config SCSI_IBMVSCSIS 888config SCSI_IBMVSCSIS
889 tristate "IBM Virtual SCSI Server support" 889 tristate "IBM Virtual SCSI Server support"
diff --git a/drivers/staging/android/binder.h b/drivers/staging/android/binder.h
index 76ead8dac265..f240464effde 100644
--- a/drivers/staging/android/binder.h
+++ b/drivers/staging/android/binder.h
@@ -224,7 +224,7 @@ enum binder_driver_return_protocol {
224 BR_SPAWN_LOOPER = _IO('r', 13), 224 BR_SPAWN_LOOPER = _IO('r', 13),
225 /* 225 /*
226 * No parameters. The driver has determined that a process has no 226 * No parameters. The driver has determined that a process has no
227 * threads waiting to service incomming transactions. When a process 227 * threads waiting to service incoming transactions. When a process
228 * receives this command, it must spawn a new service thread and 228 * receives this command, it must spawn a new service thread and
229 * register it via bcENTER_LOOPER. 229 * register it via bcENTER_LOOPER.
230 */ 230 */
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 9a2ec251ae4d..c3a90e7012af 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -72,7 +72,7 @@ int pow_receive_group = 15;
72module_param(pow_receive_group, int, 0444); 72module_param(pow_receive_group, int, 0444);
73MODULE_PARM_DESC(pow_receive_group, "\n" 73MODULE_PARM_DESC(pow_receive_group, "\n"
74 "\tPOW group to receive packets from. All ethernet hardware\n" 74 "\tPOW group to receive packets from. All ethernet hardware\n"
75 "\twill be configured to send incomming packets to this POW\n" 75 "\twill be configured to send incoming packets to this POW\n"
76 "\tgroup. Also any other software can submit packets to this\n" 76 "\tgroup. Also any other software can submit packets to this\n"
77 "\tgroup for the kernel to process."); 77 "\tgroup for the kernel to process.");
78 78
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index 2e8d06f198ae..6917a9e938e7 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -1719,7 +1719,7 @@ static struct se_node_acl *sbp_alloc_fabric_acl(struct se_portal_group *se_tpg)
1719 1719
1720 nacl = kzalloc(sizeof(struct sbp_nacl), GFP_KERNEL); 1720 nacl = kzalloc(sizeof(struct sbp_nacl), GFP_KERNEL);
1721 if (!nacl) { 1721 if (!nacl) {
1722 pr_err("Unable to alocate struct sbp_nacl\n"); 1722 pr_err("Unable to allocate struct sbp_nacl\n");
1723 return NULL; 1723 return NULL;
1724 } 1724 }
1725 1725
diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c
index b4ba0670dc54..97a511f4185d 100644
--- a/drivers/tty/ipwireless/hardware.c
+++ b/drivers/tty/ipwireless/hardware.c
@@ -646,7 +646,7 @@ static void queue_received_packet(struct ipw_hardware *hw,
646 (*assem) = pool_allocate(hw, *assem, length); 646 (*assem) = pool_allocate(hw, *assem, length);
647 if (!(*assem)) { 647 if (!(*assem)) {
648 printk(KERN_ERR IPWIRELESS_PCCARD_NAME 648 printk(KERN_ERR IPWIRELESS_PCCARD_NAME
649 ": no memory for incomming data packet, dropped!\n"); 649 ": no memory for incoming data packet, dropped!\n");
650 return; 650 return;
651 } 651 }
652 (*assem)->protocol = protocol; 652 (*assem)->protocol = protocol;
@@ -670,7 +670,7 @@ static void queue_received_packet(struct ipw_hardware *hw,
670 packet = pool_allocate(hw, NULL, length); 670 packet = pool_allocate(hw, NULL, length);
671 if (!packet) { 671 if (!packet) {
672 printk(KERN_ERR IPWIRELESS_PCCARD_NAME 672 printk(KERN_ERR IPWIRELESS_PCCARD_NAME
673 ": no memory for incomming ctrl packet, dropped!\n"); 673 ": no memory for incoming ctrl packet, dropped!\n");
674 return; 674 return;
675 } 675 }
676 packet->protocol = protocol; 676 packet->protocol = protocol;