Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9766ef8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.197 into android-4.9-q 



Changes in 4.9.197
	KVM: s390: Test for bad access register and size at the start of S390_MEM_OP
	s390/topology: avoid firing events before kobjs are created
	s390/cio: avoid calling strlen on null pointer
	s390/cio: exclude subchannels with no parent from pseudo check
	KVM: nVMX: handle page fault in vmread fix
	ASoC: Define a set of DAPM pre/post-up events
	powerpc/powernv: Restrict OPAL symbol map to only be readable by root
	can: mcp251x: mcp251x_hw_reset(): allow more time after a reset
	crypto: qat - Silence smp_processor_id() warning
	usercopy: Avoid HIGHMEM pfn warning
	timer: Read jiffies once when forwarding base clk
	watchdog: imx2_wdt: fix min() calculation in imx2_wdt_set_timeout
	ieee802154: atusb: fix use-after-free at disconnect
	cfg80211: initialize on-stack chandefs
	ima: always return negative code for error
	fs: nfs: Fix possible null-pointer dereferences in encode_attrs()
	9p: avoid attaching writeback_fid on mmap with type PRIVATE
	xen/pci: reserve MCFG areas earlier
	ceph: fix directories inode i_blkbits initialization
	ceph: reconnect connection if session hang in opening state
	drm/amdgpu: Check for valid number of registers to read
	thermal: Fix use-after-free when unregistering thermal zone device
	fuse: fix memleak in cuse_channel_open
	sched/core: Fix migration to invalid CPU in __set_cpus_allowed_ptr()
	kernel/elfcore.c: include proper prototypes
	tools lib traceevent: Do not free tep->cmdlines in add_new_comm() on failure
	perf tools: Fix segfault in cpu_cache_level__read()
	perf stat: Fix a segmentation fault when using repeat forever
	perf stat: Reset previous counts on repeat with interval
	crypto: caam - fix concurrency issue in givencrypt descriptor
	coresight: etm4x: Use explicit barriers on enable/disable
	cfg80211: add and use strongly typed element iteration macros
	cfg80211: Use const more consistently in for_each_element macros
	nl80211: validate beacon head
	ASoC: sgtl5000: Improve VAG power and mute control
	panic: ensure preemption is disabled during panic()
	USB: rio500: Remove Rio 500 kernel driver
	USB: yurex: Don't retry on unexpected errors
	USB: yurex: fix NULL-derefs on disconnect
	USB: usb-skeleton: fix runtime PM after driver unbind
	USB: usb-skeleton: fix NULL-deref on disconnect
	xhci: Fix false warning message about wrong bounce buffer write length
	xhci: Prevent device initiated U1/U2 link pm if exit latency is too long
	xhci: Check all endpoints for LPM timeout
	usb: xhci: wait for CNR controller not ready bit in xhci resume
	xhci: Increase STS_SAVE timeout in xhci_suspend()
	USB: adutux: remove redundant variable minor
	USB: adutux: fix use-after-free on disconnect
	USB: adutux: fix NULL-derefs on disconnect
	USB: adutux: fix use-after-free on release
	USB: iowarrior: fix use-after-free on disconnect
	USB: iowarrior: fix use-after-free on release
	USB: iowarrior: fix use-after-free after driver unbind
	USB: usblp: fix runtime PM after driver unbind
	USB: chaoskey: fix use-after-free on release
	USB: ldusb: fix NULL-derefs on driver unbind
	serial: uartlite: fix exit path null pointer
	USB: serial: keyspan: fix NULL-derefs on open() and write()
	USB: serial: ftdi_sio: add device IDs for Sienna and Echelon PL-20
	USB: serial: option: add Telit FN980 compositions
	USB: serial: option: add support for Cinterion CLS8 devices
	USB: serial: fix runtime PM after driver unbind
	USB: usblcd: fix I/O after disconnect
	USB: microtek: fix info-leak at probe
	USB: dummy-hcd: fix power budget for SuperSpeed mode
	usb: renesas_usbhs: gadget: Do not discard queues in usb_ep_set_{halt,wedge}()
	usb: renesas_usbhs: gadget: Fix usb_ep_set_{halt,wedge}() behavior
	USB: legousbtower: fix slab info leak at probe
	USB: legousbtower: fix deadlock on disconnect
	USB: legousbtower: fix potential NULL-deref on disconnect
	USB: legousbtower: fix open after failed reset request
	USB: legousbtower: fix use-after-free on release
	staging: vt6655: Fix memory leak in vt6655_probe
	iio: adc: ad799x: fix probe error handling
	iio: light: opt3001: fix mutex unlock race
	efivar/ssdt: Don't iterate over EFI vars if no SSDT override was specified
	perf llvm: Don't access out-of-scope array
	perf inject jit: Fix JIT_CODE_MOVE filename
	CIFS: Gracefully handle QueryInfo errors during open
	CIFS: Force revalidate inode when dentry is stale
	CIFS: Force reval dentry if LOOKUP_REVAL flag is set
	kernel/sysctl.c: do not override max_threads provided by userspace
	staging: fbtft: Stop using BL_CORE_DRIVER1
	Staging: fbtft: fix memory leak in fbtft_framebuffer_alloc
	MIPS: Disable Loongson MMI instructions for kernel build
	Fix the locking in dcache_readdir() and friends
	media: stkwebcam: fix runtime PM after driver unbind
	tracing/hwlat: Report total time spent in all NMIs during the sample
	tracing/hwlat: Don't ignore outer-loop duration when calculating max_latency
	tracing: Get trace_array reference for available_tracers files
	x86/asm: Fix MWAITX C-state hint value
	xfs: clear sb->s_fs_info on mount failure
	Linux 4.9.197

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 5bf122fd 364ef83d

Documentation/usb/rio.txt

deleted100644 → 0
+0 −138
Original line number Original line Diff line number Diff line 
Copyright (C) 1999, 2000 Bruce Tenison

Portions Copyright (C) 1999, 2000 David Nelson

Thanks to David Nelson for guidance and the usage of the scanner.txt

and scanner.c files to model our driver and this informative file.



Mar. 2, 2000



CHANGES



- Initial Revision





OVERVIEW



This README will address issues regarding how to configure the kernel

to access a RIO 500 mp3 player.  

Before I explain how to use this to access the Rio500 please be warned:



W A R N I N G:

--------------



Please note that this software is still under development.  The authors

are in no way responsible for any damage that may occur, no matter how

inconsequential.



It seems that the Rio has a problem when sending .mp3 with low batteries.

I suggest when the batteries are low and you want to transfer stuff that you

replace it with a fresh one. In my case, what happened is I lost two 16kb

blocks (they are no longer usable to store information to it). But I don't

know if that's normal or not; it could simply be a problem with the flash 

memory.



In an extreme case, I left my Rio playing overnight and the batteries wore 

down to nothing and appear to have corrupted the flash memory. My RIO 

needed to be replaced as a result.  Diamond tech support is aware of the 

problem.  Do NOT allow your batteries to wear down to nothing before 

changing them.  It appears RIO 500 firmware does not handle low battery 

power well at all. 



On systems with OHCI controllers, the kernel OHCI code appears to have 

power on problems with some chipsets.  If you are having problems 

connecting to your RIO 500, try turning it on first and then plugging it 

into the USB cable.  



Contact information:

--------------------



   The main page for the project is hosted at sourceforge.net in the following

   URL: <http://rio500.sourceforge.net>. You can also go to the project's

   sourceforge home page at: <http://sourceforge.net/projects/rio500/>.

   There is also a mailing list: rio500-users@lists.sourceforge.net



Authors:

-------



Most of the code was written by Cesar Miquel <miquel@df.uba.ar>. Keith 

Clayton <kclayton@jps.net> is incharge of the PPC port and making sure

things work there. Bruce Tenison <btenison@dibbs.net> is adding support

for .fon files and also does testing. The program will mostly sure be

re-written and Pete Ikusz along with the rest will re-design it. I would

also like to thank Tri Nguyen <tmn_3022000@hotmail.com> who provided use 

with some important information regarding the communication with the Rio.



ADDITIONAL INFORMATION and Userspace tools



http://rio500.sourceforge.net/





REQUIREMENTS



A host with a USB port.  Ideally, either a UHCI (Intel) or OHCI

(Compaq and others) hardware port should work.



A Linux development kernel (2.3.x) with USB support enabled or a

backported version to linux-2.2.x.  See http://www.linux-usb.org for

more information on accomplishing this.



A Linux kernel with RIO 500 support enabled.



'lspci' which is only needed to determine the type of USB hardware

available in your machine.



CONFIGURATION



Using `lspci -v`, determine the type of USB hardware available.



  If you see something like:



    USB Controller: ......

    Flags: .....

    I/O ports at ....



  Then you have a UHCI based controller.



  If you see something like:



     USB Controller: .....

     Flags: ....

     Memory at .....



  Then you have a OHCI based controller.



Using `make menuconfig` or your preferred method for configuring the

kernel, select 'Support for USB', 'OHCI/UHCI' depending on your

hardware (determined from the steps above), 'USB Diamond Rio500 support', and

'Preliminary USB device filesystem'.  Compile and install the modules

(you may need to execute `depmod -a` to update the module

dependencies).



Add a device for the USB rio500:

  `mknod /dev/usb/rio500 c 180 64`



Set appropriate permissions for /dev/usb/rio500 (don't forget about

group and world permissions).  Both read and write permissions are

required for proper operation.



Load the appropriate modules (if compiled as modules):



  OHCI:

    modprobe usbcore

    modprobe usb-ohci

    modprobe rio500



  UHCI:

    modprobe usbcore

    modprobe usb-uhci  (or uhci)

    modprobe rio500



That's it.  The Rio500 Utils at: http://rio500.sourceforge.net should

be able to access the rio500.



BUGS



If you encounter any problems feel free to drop me an email.



Bruce Tenison

btenison@dibbs.net

MAINTAINERS

+0 −7
Original line number Original line Diff line number Diff line
@@ -12486,13 +12486,6 @@ W: http://www.linux-usb.org/usbnet 
S:	Maintained

S:	Maintained

F:	drivers/net/usb/dm9601.c

F:	drivers/net/usb/dm9601.c





USB DIAMOND RIO500 DRIVER

M:	Cesar Miquel <miquel@df.uba.ar>

L:	rio500-users@lists.sourceforge.net

W:	http://rio500.sourceforge.net

S:	Maintained

F:	drivers/usb/misc/rio500*



USB EHCI DRIVER

USB EHCI DRIVER

M:	Alan Stern <stern@rowland.harvard.edu>

M:	Alan Stern <stern@rowland.harvard.edu>

L:	linux-usb@vger.kernel.org

L:	linux-usb@vger.kernel.org

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
VERSION = 4

VERSION = 4

PATCHLEVEL = 9

PATCHLEVEL = 9

SUBLEVEL = 196

SUBLEVEL = 197

EXTRAVERSION =

EXTRAVERSION =

NAME = Roaring Lionus

NAME = Roaring Lionus

arch/arm/configs/badge4_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,6 @@ CONFIG_USB_SERIAL_PL2303=m 
CONFIG_USB_SERIAL_CYBERJACK=m

CONFIG_USB_SERIAL_CYBERJACK=m

CONFIG_USB_SERIAL_XIRCOM=m

CONFIG_USB_SERIAL_XIRCOM=m

CONFIG_USB_SERIAL_OMNINET=m

CONFIG_USB_SERIAL_OMNINET=m

CONFIG_USB_RIO500=m

CONFIG_EXT2_FS=m

CONFIG_EXT2_FS=m

CONFIG_EXT3_FS=m

CONFIG_EXT3_FS=m

CONFIG_MSDOS_FS=y

CONFIG_MSDOS_FS=y

arch/arm/configs/corgi_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,6 @@ CONFIG_USB_SERIAL_XIRCOM=m 
CONFIG_USB_SERIAL_OMNINET=m

CONFIG_USB_SERIAL_OMNINET=m

CONFIG_USB_EMI62=m

CONFIG_USB_EMI62=m

CONFIG_USB_EMI26=m

CONFIG_USB_EMI26=m

CONFIG_USB_RIO500=m

CONFIG_USB_LEGOTOWER=m

CONFIG_USB_LEGOTOWER=m

CONFIG_USB_LCD=m

CONFIG_USB_LCD=m

CONFIG_USB_LED=m

CONFIG_USB_LED=m