Camera system from stock 2.6.35 kernel
Camera changes for 3.0 kernel
msm: camera: unnecessary kernel log cleanup.

Cleanup the incorrect usage of pr_info, pr_err and printk.

Change-Id: Iee3008d53243ce2152fb7f202ab062a4bf04f88e
Signed-off-by: Ninad Patgaonkar <ninadp@codeaurora.org>
msm: camera: Fix the broken MCE functionality

Corrected the offset values for MCE registers

Change-Id: I41c5baaf90b294506234c1e69b919c5283abef59
CRs-Fixed: 278920
Signed-off-by: Lakshmi Narayana Kalavala <lkalaval@codeaurora.org>
msm: jpeg: Reset buffer status when output buffer queue is empty

Reset buffer status for output buffer obtained from encoder
when output buffer is empty

Signed-off-by: Srinivasan Kannan <srinkann@codeaurora.org>
(cherry picked from commit ccc917d272380c341c7462d081087b6ad18bed26)

Change-Id: Icc7ca9cf75d93e132d205234e3e88e8ea0e82cc6
Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>
msm: gemini: Remove PMEM reference for input buffer

Remove PMEM reference for input buffer to prevent PMEM
leak during error case.

CRs-Fixed: 287889
Signed-off-by: Sunid Wilson <sunidw@codeaurora.org>
(cherry picked from commit f02545235282df44dd808c523d0ec9c04be6d4fe)

Change-Id: I1b7a29873b13b8f161b7fa5d6351edf6ad8eab23
Signed-off-by: Sunil Joseph <sunilj@codeaurora.org>
msm: camera: Clean up during open failure

Updated the reference count when open fails and did
proper cleanup.

CRs-Fixed: 287648
Signed-off-by: Sunid Wilson <sunidw@codeaurora.org>
(cherry picked from commit f521ef6c4402895abcfc46520db9dd6be81c28b5)

Change-Id: I6bf5d4b85022cfd2682fcec4f4c90ef8ce2fb2d2
Signed-off-by: Sunil Joseph <sunilj@codeaurora.org>
msm: camera: Handle event queue overflow error

When the config thread crashes or is in bad state, the camera
driver wont get notification which prevents the driver from
shutting down. Added code to handle this usecase.

Signed-off-by: Sunid Wilson <sunidw@codeaurora.org>
(cherry picked from commit 4882c1fdffba47564665ef483bf5fbcd73c23484)

Change-Id: I643f5ac740627e140ba65b662558258f6c1f2c2b
Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>
msm: camera: Remove additional check in msm_queue_drain

Removed additional check in msm_queue_drain to make
sure that the list is getting emptied in all cases.

Signed-off-by: Sunid Wilson <sunidw@codeaurora.org>
(cherry picked from commit 33e638a1c229765d06a76bc84351de9407026782)

Change-Id: I6b498241490c4264f93ea37b1fa97ebda4cde910
Signed-off-by: Raj Kushwaha <rajk@codeaurora.org>
msm: camera: Free buffers from frame queue at open

Free all pending frames in frame queue before cam_frame
thread opens frame device to avoid duplication of buffer
free

CRs-Fixed: 318202
Change-Id: I25d1718a37a94fa83563c4b6e99a1b7560917a7f
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>
(cherry picked from commit 5dcbcb9f04a94aa6740718a1b6d39ce4548d869c)
staging: logger: hold mutex while removing reader

The readers list is traversed under the log->mutex lock
(for example from fix_up_readers()), but the deletion of
elements from this list is not being done under this lock.

Cc: Brian Swetland <swetland@google.com>
Cc: Dima Zavin <dima@android.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cpufreq: interactive: sync android-3.0 with android-3.4

Change-Id: I71443db4edbe43a08fe58a54a742b4c788ef11e3
Signed-off-by: Todd Poynor <toddpoynor@google.com>
netfilter: xt_qtaguid: fix error exit that would keep a spinlock.

qtudev_open() could return with a uid_tag_data_tree_lock held
when an kzalloc(..., GFP_ATOMIC) would fail.
Very unlikely to get triggered AND survive the mayhem of running out of mem.

Signed-off-by: JP Abgrall <jpa@google.com>
netfilter: qtaguid: Don't BUG_ON if create_if_tag_stat fails

If create_if_tag_stat fails to allocate memory (GFP_ATOMIC) the
following will happen:

qtaguid: iface_stat: tag stat alloc failed
...
kernel BUG at xt_qtaguid.c:1482!

Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
netfilter: xt_qtaguid: remove AID_* dependency for access control

qtaguid limits what can be done with /ctrl and /stats based on group
membership.
This changes removes AID_NET_BW_STATS and AID_NET_BW_ACCT, and picks
up the groups from the gid of the matching proc entry files.

Signed-off-by: JP Abgrall <jpa@google.com>
Change-Id: I42e477adde78a12ed5eb58fbc0b277cdaadb6f94
netfilter: xt_qtaguid: extend iface stat to report protocols

In the past the iface_stat_fmt would only show global bytes/packets
for the skb-based numbers.
For stall detection in userspace, distinguishing tcp vs other protocols
makes it easier.
Now we report
  ifname total_skb_rx_bytes total_skb_rx_packets total_skb_tx_bytes
  total_skb_tx_packets {rx,tx}_{tcp,udp,ohter}_{bytes,packets}

Bug: 6818637
Signed-off-by: JP Abgrall <jpa@google.com>
Change-Id: I179c5ebf2fe822acec0bce4973b4bbb5e7d5076d
Merge branch 'ics-3.0' of https://github.com/arco/samsung-kernel-msm7x30 into ics-3.0