diff options
| author |   Tilman Schmidt <tilman@imap.cc> | 2009-05-13 12:44:17 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-05-17 20:51:24 -0700 |
| commit | 42e3d611158faa2d372ccfb1e17bfde13935de68 (patch) | |
| tree | 3018163e3181dc639e4a9d81554f354745e3feca /drivers | |
| parent | gigaset: remove obsolete references to m10x state table (diff) | |
| download | linux-dev-42e3d611158faa2d372ccfb1e17bfde13935de68.tar.xz linux-dev-42e3d611158faa2d372ccfb1e17bfde13935de68.zip | |
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')
| -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) if (!IS_ERR(cs->tty_dev)) dev_set_drvdata(cs->tty_dev, cs); else { - dev_warn(cs->dev, - "could not register device to the tty subsystem\n"); + pr_warning("could not register device to the tty subsystem\n"); cs->tty_dev = NULL; } 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) gig_dbg(DEBUG_INIT, "setting up sysfs"); if (device_create_file(cs->tty_dev, &dev_attr_cidmode)) - dev_err(cs->dev, "could not create sysfs attribute\n"); + pr_err("could not create sysfs attribute\n"); } |