diff options
author | Tilman Schmidt <tilman@imap.cc> | 2009-05-13 08:44:17 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-17 23:51:24 -0400 |
commit | 42e3d611158faa2d372ccfb1e17bfde13935de68 (patch) | |
tree | 3018163e3181dc639e4a9d81554f354745e3feca /drivers/isdn/gigaset | |
parent | 528efc6a54a9e4c03488ee72988567991c9476ba (diff) |
gigaset: fix possible oops in error handling
Use pr_warning() / pr_err() instead of dev_warn() / dev_err() in two
places where the dev pointer isn't guaranteed to be valid.
Impact: error handling bugfix
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/gigaset')
-rw-r--r-- | drivers/isdn/gigaset/interface.c | 3 | ||||
-rw-r--r-- | drivers/isdn/gigaset/proc.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index 820a30923fee..1ebfcab74662 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c | |||
@@ -599,8 +599,7 @@ void gigaset_if_init(struct cardstate *cs) | |||
599 | if (!IS_ERR(cs->tty_dev)) | 599 | if (!IS_ERR(cs->tty_dev)) |
600 | dev_set_drvdata(cs->tty_dev, cs); | 600 | dev_set_drvdata(cs->tty_dev, cs); |
601 | else { | 601 | else { |
602 | dev_warn(cs->dev, | 602 | pr_warning("could not register device to the tty subsystem\n"); |
603 | "could not register device to the tty subsystem\n"); | ||
604 | cs->tty_dev = NULL; | 603 | cs->tty_dev = NULL; |
605 | } | 604 | } |
606 | mutex_unlock(&cs->mutex); | 605 | mutex_unlock(&cs->mutex); |
diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c index da6f3acf9fd0..9715aad9c3f0 100644 --- a/drivers/isdn/gigaset/proc.c +++ b/drivers/isdn/gigaset/proc.c | |||
@@ -79,5 +79,5 @@ void gigaset_init_dev_sysfs(struct cardstate *cs) | |||
79 | 79 | ||
80 | gig_dbg(DEBUG_INIT, "setting up sysfs"); | 80 | gig_dbg(DEBUG_INIT, "setting up sysfs"); |
81 | if (device_create_file(cs->tty_dev, &dev_attr_cidmode)) | 81 | if (device_create_file(cs->tty_dev, &dev_attr_cidmode)) |
82 | dev_err(cs->dev, "could not create sysfs attribute\n"); | 82 | pr_err("could not create sysfs attribute\n"); |
83 | } | 83 | } |