summaryrefslogtreecommitdiffstats
path: root/drivers/staging/sb105x
Commit message (Collapse)AuthorAgeFilesLines
* Merge 3.8-rc5 into staging-nextGreg Kroah-Hartman2013-01-261-1/+1
|\ | | | | | | | | | | This resolves a merge issue with a iio driver, and the zram code. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging/sb105x: PARPORT config is not good enough must use PARPORT_PCSteven Rostedt2013-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | The sb105x driver calls parport_pc_probe_port() which isn't defined if PARPORT_PC isn't enabled. Protecting it with CONFIG_PARPORT is not good enough, must protect it with CONFIG_PARPORT_PC. Reported-by: Randy Dunlap <rdunlap@infradead.org> Acked-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging: sb105x: clean up interface type testDan Carpenter2013-01-182-11/+5Star
| | | | | | | | | | | | | | | | | | | | | | | | | | IIR_RS232 is zero so "if (IIR_RS232 == (b_ret & IIR_RS232))" is always true so RS232 was always chosen by default. The test should be "if (0 == (b_ret & 0x30)) { ". The other tests should also be in that format. This does change how the code works... If 0x30 is set then it now defaults to RS232 instead of RS485. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging: sb105x: move dereference under IS_ERR() checkDan Carpenter2013-01-181-2/+2
|/ | | | | | | | Avoid dereverencing the ERR_PTR() by shifting the dereference down a couple lines. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: Enable parport sb105x drivers if parport is configuredSteven Rostedt2013-01-071-0/+2
| | | | | | | | | | Some of the drivers that the sb105x SystemBase handles are for parallel port cards. If PARPORT isn't configured, the build fails. Only initialize the parallel port cards if PARPORT is configured in. Reported-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: Make SystemBase PCI Multiport UART only for x86Steven Rostedt2013-01-071-0/+1
| | | | | | | | | | | | | | The sb105x SystemBase PCI UART driver in staging has code specific for x86. This breaks allyesconfig builds for other archs. For now, the quick fix is simply to make this driver depend on x86. When I get time, I'll swap this card out of my main machine and put it into my PowerPC64 box, and get it working there. Then it may become a good samaritan and play nice with other archs. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: sb105x: fix potential NULL pointer dereference in mp_chars_in_buffer()Wei Yongjun2012-11-301-1/+2
| | | | | | | | The dereference to 'state' should be moved below the NULL test. Cc: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: Add SystemBase Multi-2/PCI driverSteven Rostedt2012-11-166-0/+4163
I ported the driver supplied by SystemBase to mainline. As the driver had MODULE_LICENSE("GPL") it is declared as a GPL module and thus I have the right to distribute it upstream. Note, I did the bare minimum to get it working. It still needs a lot of loving. Cc: hjchoi <hjchoi@sysbas.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-21 22:05:01 +0200