aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-06-13sh: Fix up link time defsym warnings.Paul Mundt1-2/+2
sh-linux-gnu-ld:--defsym 'jiffies=jiffies_64': ignoring invalid character `'' in expression For some reason ld has recently started complaining about the quotes, so just get rid of them, we don't need them for anything anyways. Signed-off-by: Paul Mundt <[email protected]>
2012-06-12target: Add TFO->put_session() caller for HW fabric session shutdownJoern Engel2-1/+8
This patch adds an optional target_core_fabric_ops->put_session() caller within the existing target_put_session() code path. This is required by tcm_qla2xxx code in order to invoke it's own fabric specific session shutdown handler using se_session->sess_kref. Signed-off-by: Joern Engel <[email protected]> Cc: Roland Dreier <[email protected]> Cc: Arun Easi <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2012-06-13sh: use the new generic strnlen_user() functionPaul Mundt7-117/+57
This discards both the _32 and _64 versions in favour of the consolidated generic one. Signed-off-by: Paul Mundt <[email protected]>
2012-06-13sh: switch to generic strncpy_from_user().Paul Mundt6-114/+5
This kills off the special sh32/64 versions and adopts the generic version. It should be possible to optimize this for SH-4A unaligned loads, but this is a corner case that can be supported incrementally. Signed-off-by: Paul Mundt <[email protected]>
2012-06-13sh: Kill off last dead UBC headerPaul Bolle1-28/+0
Commit 7025bec9125b0a02edcaf22c2dce753bf2c95480 ("sh: Kill off dead UBC headers.") skipped arch/sh/include/cpu-sh2a/cpu/ubc.h. Since nothing is using that header either, kill it off too. Signed-off-by: Paul Bolle <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-06-13serial: sh-sci: Make probe fail for ports that exceed the maximum countLaurent Pinchart1-1/+1
The driver supports a maximum number of ports configurable at compile time. Make sure the probe() method fails when registering a port that exceeds the maximum instead of returning success without registering the port. This fixes a crash at system suspend time, when the driver tried to suspend a non-registered port using the UART core. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-06-13serial: sh-sci: Fix probe error pathsLaurent Pinchart1-13/+23
When probing fails, the driver must not try to cleanup resources that have not been initialized. Fix this. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-06-12USB: option: add more YUGA device ids说不得1-17/+27
Signed-off-by: gavin zhu <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12printk: Fix alignment of buf causing crash on ARM EABIAndrew Lunn1-2/+2
Commit 7ff9554bb578ba02166071d2d487b7fc7d860d62, printk: convert byte-buffer to variable-length record buffer, causes systems using EABI to crash very early in the boot cycle. The first entry in struct log is a u64, which for EABI must be 8 byte aligned. Make use of __alignof__() so the compiler to decide the alignment, but allow it to be overridden using CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS, for systems which can perform unaligned access and want to save a few bytes of space. Tested on Orion5x and Kirkwood. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Stephen Warren <[email protected]> Acked-by: Stephen Warren <[email protected]> Acked-by: Kay Sievers <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: mos7840: Fix compilation of usb serial driverTony Zelenoff1-1/+1
The __devinitconst section can't be referenced from usb_serial_device structure. Thus removed it as it done in other mos* device drivers. Error itself: WARNING: drivers/usb/serial/mos7840.o(.data+0x8): Section mismatch in reference from the variable moschip7840_4port_device to the variable .devinit.rodata:id_table The variable moschip7840_4port_device references the variable __devinitconst id_table [v2] no attach now Signed-off-by: Tony Zelenoff <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: option: fix memory leakJohan Hovold1-1/+11
Fix memory leak introduced by commit 383cedc3bb435de7a2 ("USB: serial: full autosuspend support for the option driver") which allocates usb-serial data but never frees it. Cc: stable <[email protected]> Signed-off-by: Johan Hovold <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: option: fix port-data abuseJohan Hovold1-31/+3
Commit 8b4c6a3ab596961b78465 ("USB: option: Use generic USB wwan code") moved option port-data allocation to usb_wwan_startup but still cast the port data to the old struct... Cc: stable <[email protected]> Signed-off-by: Johan Hovold <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: mct_u232: Fix incorrect TIOCMSET returnAlan Cox1-5/+8
The low level helper returns 1 on success. The ioctl should however return 0. As this is the only user of the helper return, make the helper return 0 or an error code. Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=43009 Signed-off-by: Alan Cox <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: option: Updated Huawei K4605 has better idAndrew Bird1-0/+2
Later firmwares for this device now have proper subclass and protocol info so we can identify it nicely without needing to use the blacklist. I'm not removing the old 0xff matching as there may be devices in the field that still need that. Signed-off-by: Andrew Bird <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: serial: sierra: Add support for Sierra Wireless AirCard 320U modemTom Cassidy1-0/+4
Add support for Sierra Wireless AirCard 320U modem Signed-off-by: Tomas Cassidy <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: serial: cp210x: add Optris MS Pro usb idMikko Tuumanen1-0/+1
Signed-off-by: Mikko Tuumanen <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: ftdi-sio: Add support for RT Systems USB-RTS01 serial adapterEvan McNabb2-0/+2
Add support for RT Systems USB-RTS01 USB to Serial adapter: http://www.rtsystemsinc.com/Photos/USBRTS01.html Tested by controlling Icom IC-718 amateur radio transceiver via hamlib. Signed-off-by: Evan McNabb <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: qcserial: Add Sierra Wireless device IDsBjørn Mork1-0/+6
Some additional IDs found in the BSD/GPL licensed out-of-tree GobiSerial driver from Sierra Wireless. Signed-off-by: Bjørn Mork <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: option: Add Vodafone/Huawei K5005 supportBjørn Mork1-0/+4
Tested-by: Thomas Schäfer <[email protected]> Signed-off-by: Bjørn Mork <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12USB: cdc-wdm: Add Vodafone/Huawei K5005 supportBjørn Mork1-0/+9
Tested-by: Thomas Schäfer <[email protected]> Signed-off-by: Bjørn Mork <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12drivers/ide/ide-cs.c: adjust suspicious bit operationJulia Lawall1-1/+2
IO_DATA_PATH_WIDTH_8 is 0, so a bit-and with it is always false. The value IO_DATA_PATH_WIDTH covers the bits of the IO_DATA_PATH constants, so first pick those bits and then make the test using !=. This problem was found using Coccinelle (http://coccinelle.lip6.fr/). Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-12serial/amba-pl011: move custom pin control to driverLinus Walleij2-57/+42
We had a boot regression in Ux500 in the merge window because two orthogonal pin control schemes for the PL011 were merged at the same time: - One using the .init() and .exit() hooks into the platform for Ux500 putting the pins into default vs sleep state respectively as the port was started/stopped. commit a09806607fd20bed2f8c41fe22793386790a14aa "ARM: ux500: switch to using pinctrl for uart0" - One hogging the default setting at PL011 probe() commit 258e055111d3cde2607e0d04eb91da2f7a59b591 "serial: amba-pl011: adopt pinctrl support" To get a solution that works for both let's scrap the stuff in the platform callbacks, instead have the driver itself select default and sleep states when the port is started/stopped. Hopefully this works for all clients. Platform callbacks are bad for device tree migration anyway, so this rids us of another problem in Ux500. Cc: Shawn Guo <[email protected]> Cc: Russell King <[email protected]> Reported-by: Lee Jones <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Tested-by: Shawn Guo <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12serial: fix serial_txx9.c build warning/typoRandy Dunlap1-1/+1
Fix kconfig symbol test to use "defined": drivers/tty/serial/serial_txx9.c: warning: "CONFIG_CONSOLE_POLL" is not defined [-Wundef] Reported-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12serial: fix kernel-doc warnings in 8250.cRandy Dunlap1-1/+1
Fix kernel-doc warnings in drivers/tty/serial/8250/8250.c: Warning(drivers/tty/serial/8250/8250.c:3128): No description found for parameter 'up' Warning(drivers/tty/serial/8250/8250.c:3128): Excess function parameter 'port' description in 'serial8250_register_8250_port' Signed-off-by: Randy Dunlap <[email protected]> Acked-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12bonding: Fix corrupted queue_mappingEric Dumazet2-6/+10
In the transmit path of the bonding driver, skb->cb is used to stash the skb->queue_mapping so that the bonding device can set its own queue mapping. This value becomes corrupted since the skb->cb is also used in __dev_xmit_skb. When transmitting through bonding driver, bond_select_queue is called from dev_queue_xmit. In bond_select_queue the original skb->queue_mapping is copied into skb->cb (via bond_queue_mapping) and skb->queue_mapping is overwritten with the bond driver queue. Subsequently in dev_queue_xmit, __dev_xmit_skb is called which writes the packet length into skb->cb, thereby overwriting the stashed queue mappping. In bond_dev_queue_xmit (called from hard_start_xmit), the queue mapping for the skb is set to the stashed value which is now the skb length and hence is an invalid queue for the slave device. If we want to save skb->queue_mapping into skb->cb[], best place is to add a field in struct qdisc_skb_cb, to make sure it wont conflict with other layers (eg : Qdiscc, Infiniband...) This patchs also makes sure (struct qdisc_skb_cb)->data is aligned on 8 bytes : netem qdisc for example assumes it can store an u64 in it, without misalignment penalty. Note : we only have 20 bytes left in (struct qdisc_skb_cb)->data[]. The largest user is CHOKe and it fills it. Based on a previous patch from Tom Herbert. Signed-off-by: Eric Dumazet <[email protected]> Reported-by: Tom Herbert <[email protected]> Cc: John Fastabend <[email protected]> Cc: Roland Dreier <[email protected]> Acked-by: Neil Horman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-12bonding:record primary when modify it via sysfsWeiping Pan1-2/+6
If we modify primary via sysfs and it is not a valid slave, we should record it for future use, and this behavior is the same with bond_check_params(). Signed-off-by: Weiping Pan <[email protected]> Acked-by: Nicolas de Pesloüan <[email protected]> Signed-off-by: Jay Vosburgh <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-06-12Merge branch 'master' of git://1984.lsi.us.es/netDavid S. Miller3-34/+48
2012-06-12mwifiex: fix incorrect privacy setting in beacon and probe responseAvinash Patil1-0/+11
Test procedure: 1. Start AP with security setting (e.g. WPA2) 2. Stop AP 3. Start AP with open security Here it's observed that privacy is enabled in beacons and probe responses. This patch fixes it by checking the privacy parameter from cfg80211_ap_settings. If privacy is not set in cfg80211_ap_settings, set open authentication and no encryption in FW. Signed-off-by: Avinash Patil <[email protected]> Signed-off-by: Bing Zhao <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2012-06-12staging:iio:ad7298: Fix linker error due to missing IIO kfifo bufferLars-Peter Clausen1-0/+1
The ad7298 drivers buffer implementation uses the IIO kfifo buffer, so it needs to select IIO_KFIFO_BUF. Otherwise (if no other driver selects the symbol) the following linker error will occur: drivers/built-in.o: In function `ad7298_register_ring_funcs_and_init': (.text+0x245cf2): undefined reference to `iio_kfifo_allocate' drivers/built-in.o: In function `ad7298_register_ring_funcs_and_init': (.text+0x245d7d): undefined reference to `iio_kfifo_free' drivers/built-in.o: In function `ad7298_ring_cleanup': (.text+0x245dcd): undefined reference to `iio_kfifo_free' Signed-off-by: Lars-Peter Clausen <[email protected]> Reported-by: Randy Dunlap <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12Revert "staging: usbip: bugfix for stack corruption on 64-bit architectures"Greg Kroah-Hartman1-1/+1
This reverts commit 08224262adefb5e6460888b2490a96e1bc28aef5 as it's just not right. Reported-by: Ben Hutchings <[email protected]> Cc: stable <[email protected]> Cc: Bart Westgeest <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-06-12ALSA: HDA: Pin fixup for Zotac Z68 motherboardDavid Henningsson1-0/+9
Pin 0x1b was connected to the front panel connector, which according to the HDA standard should contain a mic and a headphone. In this case, the headphone was listed as "line out" by BIOS. Cc: [email protected] BugLink: https://bugs.launchpad.net/bugs/993162 Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-06-12ALSA: compress_core: cleanup pointers on stopVinod Koul1-0/+4
as the start can be called after stop again, we need to reset state Signed-off-by: Namarta Kohli <[email protected]> Signed-off-by: Vinod Koul <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-06-12ALSA: compress_core: don't wake up on pauseVinod Koul1-3/+1
during pause the core should maintain the status-quo on the device and pointers and not wake up. If app needs it should call DROP explcitly. Signed-off-by: Namarta Kohli <[email protected]> Signed-off-by: Vinod Koul <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-06-12Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds4-16/+51
Pull drm fixes from Dave Airlie: "As per your -rc2 announce, this is small and urgent only, The radeon one is for a regression in 3.4 so we need this one in your tree so we can send the stable one out, code in 3.4 broke some old userspaces. The max props increase fixes spew being seen on a few machines. And a ttm regression to fix some accounting issues that affect vmwgfx." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/ttm: Fix buffer object metadata accounting regression v2 drm: increase DRM_OBJECT_MAX_PROPERTY to 24 drm/radeon: fix tiling and command stream checking on evergreen v3
2012-06-12Merge tag 'writeback-lock-fix' of ↵Linus Torvalds1-0/+1
git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux Pull writeback locking fix from Wu Fengguang: "fix unbalanced wb->list_lock in 3.5-rc1" * tag 'writeback-lock-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux: writeback: Fix lock imbalance in writeback_sb_inodes()
2012-06-12drm/ttm: Fix buffer object metadata accounting regression v2Thomas Hellstrom1-10/+3
A regression was introduced in the 3.3 rc series, commit "drm/ttm: simplify memory accounting for ttm user v2", causing the metadata of buffer objects created using the ttm_bo_create() function to be accounted twice. That causes massive leaks with the vmwgfx driver running for example SpecViewperf Catia-03 test 2, eventually killing the app. Furthermore, the same commit introduces a regression where metadata accounting is leaked if a buffer object is initialized with an illegal size. This is also fixed with this commit. v2: Fixed an error path and removed an unused variable. Signed-off-by: Thomas Hellstrom <[email protected]> Reviewed-by: Konrad Rzeszutek Wilk <[email protected]> Cc: Jerome Glisse <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2012-06-12drm: increase DRM_OBJECT_MAX_PROPERTY to 24Paulo Zanoni1-1/+1
Before Kernel 3.5, no one was checking for the return value of drm_connector_attach_property, so we never noticed that we were unable to create some properties. Commit "drm: WARN() when drm_connector_attach_property fails" added a WARN when we fail to create a property, and the transition from "connector properties" to "object properties" changed the warning message a little bit. On i915 machines with many TV connectors we hit the maximum number of properties (since each TV connector uses a lot of properties), so we get a few backtraces in our logs. This commit increases the maximum number of properties to 24 hoping we'll have enough room for everybody. Chris suggested that we convert this code to "lists", but I believe this conversion can come after we make sure people's dmesgs are not spammed by our driver. Signed-off-by: Paulo Zanoni <[email protected]> Reported-by: Dave Jones <[email protected]> Tested-by: Daniel Vetter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-06-12perf tools: Fix synthesizing tracepoint names from the perf.data headersArnaldo Carvalho de Melo1-0/+32
We need to use the per event info snapshoted at record time to synthesize the events name, so do it just after reading the perf.data headers, when we already processed the /sys events data, otherwise we'll end up using the local /sys that only by sheer luck will have the same tracepoint ID -> real event association. Example: # uname -a Linux felicio.ghostprotocols.net 3.4.0-rc5+ #1 SMP Sat May 19 15:27:11 BRT 2012 x86_64 x86_64 x86_64 GNU/Linux # perf record -e sched:sched_switch usleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.015 MB perf.data (~648 samples) ] # cat /t/events/sched/sched_switch/id 279 # perf evlist -v sched:sched_switch: sample_freq=1, type: 2, config: 279, size: 80, sample_type: 1159, read_format: 7, disabled: 1, inherit: 1, mmap: 1, comm: 1, enable_on_exec: 1, sample_id_all: 1, exclude_guest: 1 # So on the above machine the sched:sched_switch has tracepoint id 279, but on the machine were we'll analyse it it has a different id: $ cat /t/events/sched/sched_switch/id 56 $ perf evlist -i /tmp/perf.data kmem:mm_balancedirty_writeout $ cat /t/events/kmem/mm_balancedirty_writeout/id 279 With this fix: $ perf evlist -i /tmp/perf.data sched:sched_switch Reported-by: Dmitry Antipov <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2012-06-12pinctrl: pinctrl-mxs: set platform driver data to NULL at errpath and at ↵Devendra Naga1-0/+2
unregister clear the platform data pointer when mxs_pinctrl_probe_dt fails, and also before the unregistering with pinctrl subsystem. Signed-off-by: Devendra Naga <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2012-06-12pinctrl: pinctrl-mxs: Take care of frees if the kzalloc failsDevendra Naga1-3/+8
if there is no purecfg , the group pointer is allocated using kzalloc and if it fails to allocate, we wont free the new_map, if config is true, we call kmemdup and if it fails to do so we wont free the allocated group if there is no purecfg. fix this by doing the frees of new_map pointer and group pointers. Acked-by: Dong Aisheng <[email protected]> Signed-off-by: Devendra Naga <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2012-06-12NFS: add an endian notation for sparseDan Carpenter1-1/+1
This is supposed to be a __be32 value. Sparse complains a lot: fs/nfs/callback_xdr.c:699:30: warning: incorrect type in initializer (different base types) fs/nfs/callback_xdr.c:699:30: expected unsigned int [unsigned] status fs/nfs/callback_xdr.c:699:30: got restricted __be32 const [usertype] csr_status fs/nfs/callback_xdr.c:715:9: warning: cast to restricted __be32 fs/nfs/callback_xdr.c:716:16: warning: incorrect type in return expression (different base types) fs/nfs/callback_xdr.c:716:16: expected restricted __be32 fs/nfs/callback_xdr.c:716:16: got unsigned int [unsigned] status Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2012-06-12NFSv4.1: integer overflow in decode_cb_sequence_args()Dan Carpenter1-3/+3
This seems like it could overflow on 32 bits. Use kmalloc_array() which has overflow protection built in. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2012-06-12mac80211: add missing kernel-docAshok Nagarajan1-0/+3
Add a few kernel-doc descriptions that were missed during mesh development. Reported-by: Randy Dunlap <[email protected]> Signed-off-by: Ashok Nagarajan <[email protected]> Acked-by: Randy Dunlap <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
2012-06-12pinctrl: pinctrl-imx: fix incorrect debug message of mapsDong Aisheng1-1/+1
After create config map, the new_map pointer becomes point to PIN_MAP_TYPE_CONFIGS_PIN map rather than PIN_MAP_TYPE_MUX_GROUP map any more. Thus using new_map pointer to display the MUX_GROUP info is not correct. Using map pointer instead to show the correct MUX_GROUP map info. Original the debug message is: imx6q-pinctrl 20e0000.iomuxc: maps: function Yp group MX6Q_PAD_SD3_CMD num 12 After fix it is: imx6q-pinctrl 20e0000.iomuxc: maps: function usdhc3 group usdhc3grp-1 num 11 Reported-by: Richard Zhao <[email protected]> Signed-off-by: Dong Aisheng <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2012-06-12pinctrl: pinctrl-imx: free if of_get_parent fails to get the parent nodeDevendra Naga1-1/+3
of_get_parent can return null if no parent node found, so the allocated new_map should be freed. Signed-off-by: Devendra Naga <[email protected]> Acked-by: Dong Aisheng <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2012-06-12pinctrl: pinctrl-imx: free allocated pinctrl_map structure only once and use ↵Devendra Naga1-16/+12
kernel facilities for IMX_PMX_DUMP a) as we allocate the pinctrl_map structure at imx_dt_node_to_map at line 167, anyway if its an element, or a num_elements * (sizeof(type)) elements allocated to one single pointer must be freed only once. CASE. A) as new_map is not moved and allocated like, for (i = 0; i < MAX_ELEMS; i++) { new_map[i] = kmalloc(numelems * size, GFP_KERNEL); } its freed as for (i = 0; i < MAX_ELEMS; i++) { kfree(new_map[i]); } CASE. B) and its allocated like new_map = kmalloc(numelems * size, GFP_KERNEL); it just needs kfree not as case A's. b) use KERN_DEBUG facility for the IMX_PMX_DUMP macro. Signed-off-by: Devendra Naga <[email protected]> Acked-by: Dong Aisheng <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2012-06-12pinctrl: nomadik: fix up typoLinus Walleij1-1/+1
Commit a60b57eddaa8af6c02cf7bbeb58ebf82881f08ac "drivers/gpio: gpio-nomadik: Add support for irqdomains" changed GPIO offset calculations to have this form: (gpio % NMK_GPIO_PER_CHIP) except in this one place for setting sleep mode, where the conversion was all wrong, and instead mod:ing the GPIO with the IRQ base which does not make any sense. So fix this up so we can use sleepmode. Reviewed-by: Lee Jones <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2012-06-12pinctrl: nomadik: add clk_prepare() callLinus Walleij1-0/+1
We now strictly require clk_prepare() calls to be issued before any clk_enable() calls. Signed-off-by: Linus Walleij <[email protected]>
2012-06-12usb: gadget: Complete fsl qe/udc driver conversionBen Collins1-2/+2
commit ec39e2ae (usb: gadget: Update fsl_qe_udc to use usb_endpoint_descriptor inside the struct usb_ep) did not completely convert the fsl gadget drivers to use the desc in usb_ep as described in commit messages. Fix the macros that were still referencing the old pointer. Signed-off-by: Ben Collins <[email protected]> Cc: Ido Shayevitz <[email protected]> [ [email protected] : brush up commit log a bit ] Signed-off-by: Felipe Balbi <[email protected]>
2012-06-12Merge branch 'for-linus' of ↵Linus Torvalds5-8/+13
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu Pull m68knommu from Greg Ungerer: "This contains five fixes. Four fix build problems introduced by recent clean up and merging of the m68k timer and ptrace code. The other fixes the 528x ColdFire CPU QSPI base address definition, missed in the ColdFire QSPI cleanup." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: make syscall_trace_enter/leave exist for non-MMU classic m68k types m68knommu: fix 68360 local setting of timer interrupt handler m68knommu: fix 68328 local setting of timer interrupt handler m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types m68knommu: m528x qspi definition fix
Powered by cgit, Gruvboxed by Blaster4385.