aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/driver.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-04-28 05:15:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:42 -0400
commit0bc11fd446d2ca29459c3c8e04a6d36db9bbbea4 (patch)
tree3464f1e029a877be3f998da7c5542617d77b324a /drivers/pnp/driver.c
parent62b0559aad5cba060568cb962e4bbb111ec73a14 (diff)
PNP: skip dev->protocol NULL checks
Every PNP device should have a valid protocol pointer. If it doesn't, something's wrong and we should oops so we can find and fix the problem. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Adam Belay <ambx1@neo.rr.com> Cc: Adrian Bunk <bunk@kernel.org> Cc: Rene Herman <rene.herman@keyaccess.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pnp/driver.c')
-rw-r--r--drivers/pnp/driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 12a1645a2e43..e85cbf116db1 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -167,7 +167,7 @@ static int pnp_bus_suspend(struct device *dev, pm_message_t state)
167 return error; 167 return error;
168 } 168 }
169 169
170 if (pnp_dev->protocol && pnp_dev->protocol->suspend) 170 if (pnp_dev->protocol->suspend)
171 pnp_dev->protocol->suspend(pnp_dev, state); 171 pnp_dev->protocol->suspend(pnp_dev, state);
172 return 0; 172 return 0;
173} 173}
@@ -181,7 +181,7 @@ static int pnp_bus_resume(struct device *dev)
181 if (!pnp_drv) 181 if (!pnp_drv)
182 return 0; 182 return 0;
183 183
184 if (pnp_dev->protocol && pnp_dev->protocol->resume) 184 if (pnp_dev->protocol->resume)
185 pnp_dev->protocol->resume(pnp_dev); 185 pnp_dev->protocol->resume(pnp_dev);
186 186
187 if (pnp_can_write(pnp_dev)) { 187 if (pnp_can_write(pnp_dev)) {