Added a check of the return value of the kobject_set_name function.
Signed-off-by: Anton Protopopov <[email protected]>
---
drivers/staging/comedi/comedi_fops.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 9d99fb3..dfeefa2 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2597,7 +2597,14 @@ static int __init comedi_init(void)
return -EIO;
cdev_init(&comedi_cdev, &comedi_fops);
comedi_cdev.owner = THIS_MODULE;
- kobject_set_name(&comedi_cdev.kobj, "comedi");
+
+ retval = kobject_set_name(&comedi_cdev.kobj, "comedi");
+ if (retval) {
+ unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
+ COMEDI_NUM_MINORS);
+ return retval;
+ }
+
if (cdev_add(&comedi_cdev, MKDEV(COMEDI_MAJOR, 0), COMEDI_NUM_MINORS)) {
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
COMEDI_NUM_MINORS);
--
1.8.3.4
On 2014-06-07 14:56, Anton Protopopov wrote:
> Added a check of the return value of the kobject_set_name function.
>
> Signed-off-by: Anton Protopopov <[email protected]>
> ---
> drivers/staging/comedi/comedi_fops.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
Reviewed-by: Ian Abbott <[email protected]>
--
-=( Ian Abbott @ MEV Ltd. E-mail: <[email protected]> )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
2014-06-09 14:01 GMT+04:00 Ian Abbott <[email protected]>:
> On 2014-06-07 14:56, Anton Protopopov wrote:
>>
>> Added a check of the return value of the kobject_set_name function.
>>
>> Signed-off-by: Anton Protopopov <[email protected]>
>> ---
>> drivers/staging/comedi/comedi_fops.c | 9 ++++++++-
>> 1 file changed, 8 insertions(+), 1 deletion(-)
>
>
> Reviewed-by: Ian Abbott <[email protected]>
This patch was lost, I guess?
>
> --
> -=( Ian Abbott @ MEV Ltd. E-mail: <[email protected]> )=-
> -=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
On Wed, Jul 09, 2014 at 08:24:06AM +0400, Anton Protopopov wrote:
> 2014-06-09 14:01 GMT+04:00 Ian Abbott <[email protected]>:
> > On 2014-06-07 14:56, Anton Protopopov wrote:
> >>
> >> Added a check of the return value of the kobject_set_name function.
> >>
> >> Signed-off-by: Anton Protopopov <[email protected]>
> >> ---
> >> drivers/staging/comedi/comedi_fops.c | 9 ++++++++-
> >> 1 file changed, 8 insertions(+), 1 deletion(-)
> >
> >
> > Reviewed-by: Ian Abbott <[email protected]>
>
> This patch was lost, I guess?
I don't seem to have it anymore in my inbox, please resend.
greg k-h
09.07.2014 08:28, gregkh пишет:
> On Wed, Jul 09, 2014 at 08:24:06AM +0400, Anton Protopopov wrote:
>> 2014-06-09 14:01 GMT+04:00 Ian Abbott <[email protected]>:
>>> On 2014-06-07 14:56, Anton Protopopov wrote:
>>>>
>>>> Added a check of the return value of the kobject_set_name function.
>>>>
>>>> Signed-off-by: Anton Protopopov <[email protected]>
>>>> ---
>>>> drivers/staging/comedi/comedi_fops.c | 9 ++++++++-
>>>> 1 file changed, 8 insertions(+), 1 deletion(-)
>>>
>>>
>>> Reviewed-by: Ian Abbott <[email protected]>
>>
>> This patch was lost, I guess?
>
> I don't seem to have it anymore in my inbox, please resend.
>
> greg k-h
>
Added a check of the return value of the kobject_set_name function.
Signed-off-by: Anton Protopopov <[email protected]>
---
drivers/staging/comedi/comedi_fops.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 9d99fb3..dfeefa2 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2597,7 +2597,14 @@ static int __init comedi_init(void)
return -EIO;
cdev_init(&comedi_cdev, &comedi_fops);
comedi_cdev.owner = THIS_MODULE;
- kobject_set_name(&comedi_cdev.kobj, "comedi");
+
+ retval = kobject_set_name(&comedi_cdev.kobj, "comedi");
+ if (retval) {
+ unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
+ COMEDI_NUM_MINORS);
+ return retval;
+ }
+
if (cdev_add(&comedi_cdev, MKDEV(COMEDI_MAJOR, 0), COMEDI_NUM_MINORS)) {
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
COMEDI_NUM_MINORS);
--
1.8.3.4
On Wed, Jul 09, 2014 at 08:48:53AM +0400, Anton Protopopov wrote:
>
>
> 09.07.2014 08:28, gregkh пишет:
> > On Wed, Jul 09, 2014 at 08:24:06AM +0400, Anton Protopopov wrote:
> >> 2014-06-09 14:01 GMT+04:00 Ian Abbott <[email protected]>:
> >>> On 2014-06-07 14:56, Anton Protopopov wrote:
> >>>>
> >>>> Added a check of the return value of the kobject_set_name function.
> >>>>
> >>>> Signed-off-by: Anton Protopopov <[email protected]>
> >>>> ---
> >>>> drivers/staging/comedi/comedi_fops.c | 9 ++++++++-
> >>>> 1 file changed, 8 insertions(+), 1 deletion(-)
> >>>
> >>>
> >>> Reviewed-by: Ian Abbott <[email protected]>
> >>
> >> This patch was lost, I guess?
> >
> > I don't seem to have it anymore in my inbox, please resend.
> >
> > greg k-h
> >
>
>
> Added a check of the return value of the kobject_set_name function.
>
> Signed-off-by: Anton Protopopov <[email protected]>
> ---
> drivers/staging/comedi/comedi_fops.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
Please send in a format I can apply in (i.e. I don't have to edit the
changelog by hand...)
Added a check of the return value of the kobject_set_name function.
Signed-off-by: Anton Protopopov <[email protected]>
---
drivers/staging/comedi/comedi_fops.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 9d99fb3..dfeefa2 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2597,7 +2597,14 @@ static int __init comedi_init(void)
return -EIO;
cdev_init(&comedi_cdev, &comedi_fops);
comedi_cdev.owner = THIS_MODULE;
- kobject_set_name(&comedi_cdev.kobj, "comedi");
+
+ retval = kobject_set_name(&comedi_cdev.kobj, "comedi");
+ if (retval) {
+ unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
+ COMEDI_NUM_MINORS);
+ return retval;
+ }
+
if (cdev_add(&comedi_cdev, MKDEV(COMEDI_MAJOR, 0), COMEDI_NUM_MINORS)) {
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
COMEDI_NUM_MINORS);
--
1.8.3.4