diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /drivers/misc | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/ibmasm/ibmasm.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h index 1cef2387fa65..6aba41954448 100644 --- a/drivers/misc/ibmasm/ibmasm.h +++ b/drivers/misc/ibmasm/ibmasm.h | |||
| @@ -101,15 +101,16 @@ struct command { | |||
| 101 | static inline void command_put(struct command *cmd) | 101 | static inline void command_put(struct command *cmd) |
| 102 | { | 102 | { |
| 103 | unsigned long flags; | 103 | unsigned long flags; |
| 104 | spinlock_t *lock = cmd->lock; | ||
| 104 | 105 | ||
| 105 | spin_lock_irqsave(cmd->lock, flags); | 106 | spin_lock_irqsave(lock, flags); |
| 106 | kobject_put(&cmd->kobj); | 107 | kobject_put(&cmd->kobj); |
| 107 | spin_unlock_irqrestore(cmd->lock, flags); | 108 | spin_unlock_irqrestore(lock, flags); |
| 108 | } | 109 | } |
| 109 | 110 | ||
| 110 | static inline void command_get(struct command *cmd) | 111 | static inline void command_get(struct command *cmd) |
| 111 | { | 112 | { |
| 112 | kobject_get(&cmd->kobj); | 113 | kobject_get(&cmd->kobj); |
| 113 | } | 114 | } |
| 114 | 115 | ||
| 115 | 116 | ||
