Message ID | Pine.LNX.4.64.1312301455460.28888@axis700.grange (mailing list archive) |
---|---|
State | Accepted |
Commit | a85159fece07 |
Delegated to: | Dan Williams |
Headers | show |
On Mon, Dec 30, 2013 at 02:58:04PM +0100, Guennadi Liakhovetski wrote: > With Device Tree a typical DMA controller device name can look like > 10000000.dma-controller, which extends the current size of the string, > allocated for this parameter. This patch extends its size from 20 to 32 > characters. > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Applied, thanks -- ~Vinod > --- > drivers/dma/dmatest.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c > index 20f9a3a..79c87fa 100644 > --- a/drivers/dma/dmatest.c > +++ b/drivers/dma/dmatest.c > @@ -31,7 +31,7 @@ module_param_string(channel, test_channel, sizeof(test_channel), > S_IRUGO | S_IWUSR); > MODULE_PARM_DESC(channel, "Bus ID of the channel to test (default: any)"); > > -static char test_device[20]; > +static char test_device[32]; > module_param_string(device, test_device, sizeof(test_device), > S_IRUGO | S_IWUSR); > MODULE_PARM_DESC(device, "Bus ID of the DMA Engine to test (default: any)"); > @@ -89,7 +89,7 @@ MODULE_PARM_DESC(verbose, "Enable \"success\" result messages (default: off)"); > struct dmatest_params { > unsigned int buf_size; > char channel[20]; > - char device[20]; > + char device[32]; > unsigned int threads_per_chan; > unsigned int max_channels; > unsigned int iterations; > -- > 1.7.2.5 >
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index 20f9a3a..79c87fa 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c @@ -31,7 +31,7 @@ module_param_string(channel, test_channel, sizeof(test_channel), S_IRUGO | S_IWUSR); MODULE_PARM_DESC(channel, "Bus ID of the channel to test (default: any)"); -static char test_device[20]; +static char test_device[32]; module_param_string(device, test_device, sizeof(test_device), S_IRUGO | S_IWUSR); MODULE_PARM_DESC(device, "Bus ID of the DMA Engine to test (default: any)"); @@ -89,7 +89,7 @@ MODULE_PARM_DESC(verbose, "Enable \"success\" result messages (default: off)"); struct dmatest_params { unsigned int buf_size; char channel[20]; - char device[20]; + char device[32]; unsigned int threads_per_chan; unsigned int max_channels; unsigned int iterations;
With Device Tree a typical DMA controller device name can look like 10000000.dma-controller, which extends the current size of the string, allocated for this parameter. This patch extends its size from 20 to 32 characters. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/dma/dmatest.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)