- 21 Sep, 2012 5 commits
-
-
Adam Buchbinder authored
"Whether" is spelled "wether" in several places. This fixes those that are in the staging tree. Signed-off-by:
Adam Buchbinder <adam.buchbinder@gmail.com> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Randy Dunlap authored
Fix kconfig dependencies in silicom. Fixes these build errors: ERROR: "init_net" [drivers/staging/silicom/bypasslib/bypass.ko] undefined! ERROR: "register_netdevice_notifier" [drivers/staging/silicom/bpctl_mod.ko] undefined! ERROR: "unregister_netdevice_notifier" [drivers/staging/silicom/bpctl_mod.ko] undefined! ERROR: "init_net" [drivers/staging/silicom/bpctl_mod.ko] undefined! ERROR: "netdev_info" [drivers/net/mii.ko] undefined! ERROR: "netif_carrier_on" [drivers/net/mii.ko] undefined! ERROR: "netif_carrier_off" [drivers/net/mii.ko] undefined! Signed-off-by:
Randy Dunlap <rdunlap@xenotime.net> Signed-off-by:
-
Radhesh Fadnis authored
There was an error in check for the valid temperature in function temp_to_adc_conversion. The temperature value was compared with higher limit for less than condition as well, resulting in returning -EINVAL. Corrected the check condition to properly check for lower and higher temperature limits. Signed-off-by:
Radhesh Fadnis <radhesh.fadnis@ti.com> Signed-off-by:
Eduardo Valentin <eduardo.valentin@ti.com> Signed-off-by:
-
navin authored
In response to "usbip detach -p [port_number]" user command,vhci_shutdown_connection() gets executed which kills tcp_tx,tcp_rx kernel threads but doesn't set thread pointers to NULL. so, at the time of vhci_hcd removal vhci_shutdown_connection() again tries to kill kernel threads which are already killed. [ 312.220259] BUG: unable to handle kernel NULL pointer dereference at (null) [ 312.220313] IP: [<ffffffff8108186f>] exit_creds+0x1f/0x70 [ 312.220349] PGD 5b7be067 PUD 5b7dc067 PMD 0 [ 312.220388] Oops: 0000 [#1] SMP [ 312.220415] Modules linked in: vhci_hcd(O-) usbip_host(O) usbip_core(O) uas usb_storage joydev parport_pc bnep rfcomm ppdev binfmt_misc snd_hda_codec_hdmi snd_hda_codec_conexant snd_hda_intel snd_hda_codec snd_hwdep snd_pcm snd_seq_midi arc4 snd_rawmidi snd_seq_midi_event snd_seq ath9k mac80211 ath9k_common ath9k_hw snd_timer snd_seq_device snd ath i915 drm_kms_helper drm psmouse cfg80211 coretemp soundcore lpc_ich i2c_algo_bit snd_page_alloc video intel_ips wmi btusb mac_hid bluetooth ideapad_laptop lp sparse_keymap serio_raw mei microcode parport r8169 [ 312.220862] CPU 0 [ 312.220882] Pid: 2095, comm: usbip_eh Tainted: G O 3.6.0-rc3+ #2 LENOVO 20042 /Base Board Product Name [ 312.220938] RIP: 0010:[<ffffffff8108186f>] [<ffffffff8108186f>] exit_creds+0x1f/0x70 [ 312.220979] RSP: 0018:ffff88004d6ebdb0 EFLAGS: 00010282 [ 312.221008] RAX: 0000000000000000 RBX: ffff880041c4db40 RCX: ffff88005ad52230 [ 312.221041] RDX: 0000000000000034 RSI: 0000000000000286 RDI: 0000000000000000 [ 312.221074] RBP: ffff88004d6ebdc0 R08: ffff88004d6ea000 R09: 0000000000000000 [ 312.221107] R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000000 [ 312.221144] R13: 0000000000000000 R14: ffff88005ad521d8 R15: ffff88004d6ebea0 [ 312.221177] FS: 0000000000000000(0000) GS:ffff880077400000(0000) knlGS:0000000000000000 [ 312.221214] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 312.221241] CR2: 0000000000000000 CR3: 000000005b7b9000 CR4: 00000000000007f0 [ 312.221277] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 312.221309] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 312.221342] Process usbip_eh (pid: 2095, threadinfo ffff88004d6ea000, task ffff88004d44db40) [ 312.221384] Stack: [ 312.221396] ffff88004d6ebdc0 ffff880041c4db40 ffff88004d6ebde0 ffffffff81052aaa [ 312.221442] ffff880041c4db40 0000000000000000 ffff88004d6ebe10 ffffffff8107a148 [ 312.221487] ffff88005ad521f0 ffff88005ad52228 ffff88004d44db40 ffff88005ad521d8 [ 312.221536] Call Trace: [ 312.221556] [<ffffffff81052aaa>] __put_task_struct+0x4a/0x140 [ 312.221587] [<ffffffff8107a148>] kthread_stop+0x108/0x110 [ 312.221616] [<ffffffffa0412569>] vhci_shutdown_connection+0x49/0x2b4 [vhci_hcd] [ 312.221657] [<ffffffffa0139920>] event_handler_loop+0x70/0x140 [usbip_core] [ 312.221692] [<ffffffff8107ad30>] ? add_wait_queue+0x60/0x60 [ 312.221721] [<ffffffffa01398b0>] ? usbip_stop_eh+0x30/0x30 [usbip_core] [ 312.221754] [<ffffffff8107a453>] kthread+0x93/0xa0 [ 312.221784] [<ffffffff81670e84>] kernel_thread_helper+0x4/0x10 [ 312.221814] [<ffffffff8107a3c0>] ? flush_kthread_worker+0xb0/0xb0 [ 312.223589] [<ffffffff81670e80>] ? gs_change+0x13/0x13 [ 312.225360] Code: 0b 0f 0b 66 0f 1f 84 00 00 00 00 00 55 48 89 e5 53 48 83 ec 08 66 66 66 66 90 48 8b 87 58 04 00 00 48 89 fb 48 8b bf 50 04 00 00 <8b> 00 48 c7 83 50 04 00 00 00 00 00 00 f0 ff 0f 0f 94 c0 84 c0 [ 312.229663] RIP [<ffffffff8108186f>] exit_creds+0x1f/0x70 [ 312.231696] RSP <ffff88004d6ebdb0> [ 312.233648] CR2: 0000000000000000 [ 312.256464] ---[ end trace 1971ce612a167279 ]--- Signed-off-by:
navin patidar <navinp@cdac.in> Acked-by:
Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by:
-
navin authored
stub_shutdown_connection() should set kernel thread pointers to NULL after killing them. so that at the time of usbip_host removal stub_shutdown_connection() doesn't try to kill kernel threads which are already killed. [ 1504.312158] BUG: unable to handle kernel NULL pointer dereference at (null) [ 1504.315833] IP: [<ffffffff8108186f>] exit_creds+0x1f/0x70 [ 1504.317688] PGD 41f1c067 PUD 41d0f067 PMD 0 [ 1504.319611] Oops: 0000 [#2] SMP [ 1504.321480] Modules linked in: vhci_hcd(O) usbip_host(O-) usbip_core(O) uas usb_storage joydev parport_pc bnep rfcomm ppdev binfmt_misc snd_hda_codec_hdmi snd_hda_codec_conexant snd_hda_intel snd_hda_codec snd_hwdep snd_pcm snd_seq_midi arc4 snd_rawmidi snd_seq_midi_event snd_seq ath9k mac80211 ath9k_common ath9k_hw snd_timer snd_seq_device snd ath i915 drm_kms_helper drm psmouse cfg80211 coretemp soundcore lpc_ich i2c_algo_bit snd_page_alloc video intel_ips wmi btusb mac_hid bluetooth ideapad_laptop lp sparse_keymap serio_raw mei microcode parport r8169 [ 1504.329666] CPU 1 [ 1504.329687] Pid: 2434, comm: usbip_eh Tainted: G D O 3.6.0-rc31+ #2 LENOVO 20042 /Base Board Product Name [ 1504.333502] RIP: 0010:[<ffffffff8108186f>] [<ffffffff8108186f>] exit_creds+0x1f/0x70 [ 1504.335371] RSP: 0018:ffff880041c7fdd0 EFLAGS: 00010282 [ 1504.337226] RAX: 0000000000000000 RBX: ffff880041c2db40 RCX: ffff880041e4ae50 [ 1504.339101] RDX: 0000000000000044 RSI: 0000000000000286 RDI: 0000000000000000 [ 1504.341027] RBP: ffff880041c7fde0 R08: ffff880041c7e000 R09: 0000000000000000 [ 1504.342934] R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000000 [ 1504.344840] R13: 0000000000000000 R14: ffff88004d448000 R15: ffff880041c7fea0 [ 1504.346743] FS: 0000000000000000(0000) GS:ffff880077440000(0000) knlGS:0000000000000000 [ 1504.348671] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 1504.350612] CR2: 0000000000000000 CR3: 0000000041d0d000 CR4: 00000000000007e0 [ 1504.352723] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1504.354734] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 1504.356737] Process usbip_eh (pid: 2434, threadinfo ffff880041c7e000, task ffff88004d448000) [ 1504.358711] Stack: [ 1504.360635] ffff880041c7fde0 ffff880041c2db40 ffff880041c7fe00 ffffffff81052aaa [ 1504.362589] ffff880041c2db40 0000000000000000 ffff880041c7fe30 ffffffff8107a148 [ 1504.364539] ffff880041e4ae10 ffff880041e4ae00 ffff88004d448000 ffff88004d448000 [ 1504.366470] Call Trace: [ 1504.368368] [<ffffffff81052aaa>] __put_task_struct+0x4a/0x140 [ 1504.370307] [<ffffffff8107a148>] kthread_stop+0x108/0x110 [ 1504.370312] [<ffffffffa040da4e>] stub_shutdown_connection+0x3e/0x1b0 [usbip_host] [ 1504.370315] [<ffffffffa03fd920>] event_handler_loop+0x70/0x140 [usbip_core] [ 1504.370318] [<ffffffff8107ad30>] ? add_wait_queue+0x60/0x60 [ 1504.370320] [<ffffffffa03fd8b0>] ? usbip_stop_eh+0x30/0x30 [usbip_core] [ 1504.370322] [<ffffffff8107a453>] kthread+0x93/0xa0 [ 1504.370327] [<ffffffff81670e84>] kernel_thread_helper+0x4/0x10 [ 1504.370330] [<ffffffff8107a3c0>] ? flush_kthread_worker+0xb0/0xb0 [ 1504.370332] [<ffffffff81670e80>] ? gs_change+0x13/0x13 [ 1504.370351] Code: 0b 0f 0b 66 0f 1f 84 00 00 00 00 00 55 48 89 e5 53 48 83 ec 08 66 66 66 66 90 48 8b 87 58 04 00 00 48 89 fb 48 8b bf 50 04 00 00 <8b> 00 48 c7 83 50 04 00 00 00 00 00 00 f0 ff 0f 0f 94 c0 84 c0 [ 1504.370353] RIP [<ffffffff8108186f>] exit_creds+0x1f/0x70 [ 1504.370353] RSP <ffff880041c7fdd0> [ 1504.370354] CR2: 0000000000000000 [ 1504.401376] ---[ end trace 1971ce612a16727a ]--- Signed-off-by:
-
- 19 Sep, 2012 30 commits
-
-
Ian Abbott authored
`parse_insn()` is dereferencing the user-space pointer `insn->data` directly when handling the `INSN_INTTRIG` comedi instruction. It shouldn't be using `insn->data` at all; it should be using the separate `data` pointer passed to the function. Fix it. Cc: stable <stable@vger.kernel.org> Signed-off-by:
Ian Abbott <abbotti@mev.co.uk> Signed-off-by:
-
Ian Abbott authored
`insn_rw_emulate_bits()` is used to emulate the `INSN_READ` and `INSN_WRITE` comedi instructions for subdevices that don't have an `insn_read()` or `insn_write()` handler but do have an `insn_bits()` handler. The function fills in a temporary `struct comedi_insn` called `new_insn` to pass to the subdevice's `insn_bits()` handler. In doing so, it sets the `new_insn.data` pointer to point to a temporary data array. This results in a warning from "sparse" because the `data` pointer in `struct comedi_insn` has the `__user` tag. The subdevice's `insn_bits()` handler ignores it anyway as it gets passed a pointer to the temporary data array in a separate parameter. Don't bother setting `new_insn.data`; just leave it set to `NULL` (done by an earlier `memset()`). Signed-off-by:
-
Ian Abbott authored
For the COMEDI_DEVCONFIG ioctl, the user application may embed a pointer to firmware data within a designated element (or two elements for 64-bit pointers) of the `options[]` array in the `struct comedi_devconfig`. `do_devconfig_ioctl()` calls `comedi_aux_data()` to extract the pointer value. It needs to be treated as a `__user` pointer so the firmware data can be copied into kernel memory, so cast the result of `comedi_aux_data()` to avoid a "sparse" warning. This is not ideal but `comedi_aux_data()` is called elsewhere in a wholly kernel memory context so we can't just change its return type to include the `__user` tag. Signed-off-by:
-
H Hartley Sweeten authored
The 'pci_base' variable is only used to hold the pci_resource_start() value used to ioremap the pci bars. Remove the local variable and just use pci_resource_start() directly in the ioremap. Signed-off-by:
H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by:
-
H Hartley Sweeten authored
Use pci_resource_len() when doing the ioremap instead of assuming the resource size. Signed-off-by:
-
H Hartley Sweeten authored
After a successful attach, output a simple dev_info message. Signed-off-by:
-
H Hartley Sweeten authored
Use the dev->driver->driver_name instead of the literal string for the reqource name passed to comedi_pci_enable(). Signed-off-by:
-
H Hartley Sweeten authored
This driver no longer uses comedi_config to attach so this comment does not apply. Signed-off-by:
-
H Hartley Sweeten authored
These kernel messages are just noise and should be removed in the final driver. Signed-off-by:
-
H Hartley Sweeten authored
DEBUG_EEPROM is not defined anywhere and these messages are just noise. Remove them. Signed-off-by:
-
H Hartley Sweeten authored
They are commented out and are are just noise anyway. Signed-off-by:
-
H Hartley Sweeten authored
Change the whitespace of the range table to avoid the > 80 char lines and the ugly line breaks. Convert the RANGE() values into the appropriate {BIP,UNI}_RANGE(). Signed-off-by: -
H Hartley Sweeten authored
This comedi_lrange is the same as the global range_bipolar10 exported by the comedi core. Use that range instead. Signed-off-by:
-
H Hartley Sweeten authored
Convert this PCI driver to use the comedi PCI auto config attach mechanism by adding an 'attach_pci' callback function. Since the driver does not require any external configuration options. and the legacy 'attach' callback is now optional, remove it. Signed-off-by:
-
H Hartley Sweeten authored
This driver requires loading a firmware file for the cpld. This is currently being done by passing the firmware data using the COMEDI_DEVCONFIG ioctl through the attach() hook in the driver. This does not work for auto-configured PCI devices due to the firmware loading options not being set in the comedi_devconfig parameter passed to the driver. Change the driver so it gets the firmware using request_firmware() and ignore any firmware options passed in the comedi_devconfig. Signed-off-by:
-
H Hartley Sweeten authored
These macros rely on a local variable having a specific name. Signed-off-by:
-
H Hartley Sweeten authored
In this driver the PCI bar 2 resource is being ioremap'ed to a void * in the private data. This void * is then being cast to a struct daqboard2000_hw * that defines all the registers used by the driver. This is causing a number of sparse warnings similar to: warning: incorrect type in argument 1 (different address space) expected void const volatile [noderef] <asn:2>*addr got void * Change the type in the private data to void __iomem * to correctly store the ioremap'ed address. Remove struct daqboard2000_hw and change the contents to #define's for the register memory map. Signed-off-by: -
H Hartley Sweeten authored
Rename 'chanlist_saver' to 'user_chanlist' to avoid confusion that it's actually a __user *. The chanlist pointer in comedi_cmd is still a user space pointer when the comedi_cmd is copied with copy_from_user() in do_cmd_ioctl() and do_cmdtest_ioctl(). This pointer needs to be cast when it is saved in user_chanlist in order to preserve its address space. The copy_from_user() call to copy the chanlist to the kernel space comedi_command requires the second parameter to be a __user pointer. Use the correctly cast user_chanlist instead of cmd->chanlist. Before the comedi_cmd is copied back to user space, the saved user_chanlist pointer is restored. Cast the user_chanlist again so that the address space matches the comedi_cmd. Signed-off-by:
-
H Hartley Sweeten authored
This local variable is used to hold the comedi_cmd that is passed to the kernel as the argument to the COMEDI_CMDTEST ioctl. Its filled in with a copy_from_user() call. The name 'user_cmd' is a bit confusing since it's actually kernel data. Rename the local variable to 'cmd' to avoid the confusion. Signed-off-by:
-
H Hartley Sweeten authored
This local variable is used to hold the comedi_cmd that is passed to the kernel as the argument to the COMEDI_CMD ioctl. Its filled in with a copy_from_user() call. The name 'user_cmd' is a bit confusing since it's actually kernel data. Rename the local variable to 'cmd' to avoid the confusion. Signed-off-by:
-
H Hartley Sweeten authored
This parameter is actually the unsigned long arg passed in the ioctl. comedi_unlocked_ioctl() casts it as a (struct comedi_cmd __user *) when calling do_cmd_ioctl(). Rename the variable to keep this clear. Signed-off-by:
-
H Hartley Sweeten authored
The 'chanlist' is passed to the kernel from user space with the COMEDI_CMD and COMEDI_CMDTEST ioctls. The do_cmd_ioctl() and do_cmdtest_ioctl() functions in comedi_fops.c copy this data to/from user space to kernel space correctly. Unfortunately, this data is copied back into a struct comedi_cmd so when the cmd is passed down to the drivers they still see the pointer as __user data. This results is a number of sparse errors such as: warning: dereference of noderef expression warning: incorrect type in argument 2 (different address spaces) expected void const *<noident> got unsigned int [noderef] <asn:1>*chanlist warning: incorrect type in argument 3 (different address spaces) expected unsigned int *chanlist got unsigned int [noderef] <asn:1>*chanlist warning: incorrect type in assignment (different address spaces) expected unsigned int *ai_chanlist got unsigned int [noderef] <asn:1>*chanlist The two functions in comedi_fops are the only ones that need the __user tag. Remove the tag so that all the drivers see the chanlist pointer in the correct address space. Signed-off-by: -
H Hartley Sweeten authored
The extra indents in this file cause git diff to not know the section where changes are being made. This results in diff outputs like: @@ -365,7 +365,10 @@ instead of the more informational: @@ -365,6 +365,7 @@ struct comedi_cmd { Remove all the extra indents. Signed-off-by: -
Emil Goode authored
Smatch is warning about a dereference before we check for NULL. This patch moves the dereference to after the NULL check. Smatch warning: drivers/staging/wlan-ng/cfg80211.c:345 prism2_scan() warn: variable dereferenced before check 'request' (see line 332) Signed-off-by:
Emil Goode <emilgoode@gmail.com> Signed-off-by:
-
Fengguang Wu authored
Generated by: scripts/coccinelle/null/badzero.cocci Signed-off-by:
Fengguang Wu <fengguang.wu@intel.com> Signed-off-by:
-
Kevin McKinney authored
This patch cuddles braces as reported by checkpatch.pl. Signed-off-by:
Kevin McKinney <klmckinney1@gmail.com> Signed-off-by:
-
Kevin McKinney authored
This patch properly formats comments as reported by checkpatch.pl. Signed-off-by:
-
Kevin McKinney authored
This patch fixes all white space issues as reported by checkpatch.pl. Signed-off-by:
-
Daniel Cotey authored
remove code or change to traditional comments Signed-off-by:
Daniel Cotey <puff65537@bansheeslibrary.com> Signed-off-by:
-
Daniel Cotey authored
Fix up all the returns to cannonical form, and an ifdef removal Signed-off-by:
-
- 18 Sep, 2012 5 commits
-
-
Greg Kroah-Hartman authored
As discussed at the kernel summit this year, CONFIG_EXPERIMENTAL means nothing, so let's get rid of it. Cc: Kees Cook <keescook@chromium.org> Signed-off-by: -
Greg Kroah-Hartman authored
Properly check the return value of copy_from/to_user() and handle any errors that might happen. This removes a bunch of compiler warnings. Cc: Alois Schlögl <alois.schloegl@ist.ac.at> Cc: Greg P. Smith <greg@ced.co.uk> Signed-off-by: -
Greg Kroah-Hartman authored
A basic Lindent run on the .c files, clean up the .h file by hand. Cc: Alois Schlögl <alois.schloegl@ist.ac.at> Cc: Greg P. Smith <greg@ced.co.uk> Signed-off-by: -
Greg Kroah-Hartman authored
This adds the ced1401 driver to the build system. Yes, there are a lot of warning messages, but it does compile, so it should be good to get going. Cc: Alois Schlögl <alois.schloegl@ist.ac.at> Cc: Greg P. Smith <greg@ced.co.uk> Signed-off-by: -
Greg Kroah-Hartman authored
This adds a first cut of a TODO file to get this driver out of the staging directory. Cc: Alois Schlögl <alois.schloegl@ist.ac.at> Cc: Greg P. Smith <greg@ced.co.uk> Signed-off-by:
-
