projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: core: config: fix validation of wMaxPacketValue entries
[linux-2.6-microblaze.git]
/
drivers
/
watchdog
/
diag288_wdt.c
diff --git
a/drivers/watchdog/diag288_wdt.c
b/drivers/watchdog/diag288_wdt.c
index
aafc8d9
..
4cb1087
100644
(file)
--- a/
drivers/watchdog/diag288_wdt.c
+++ b/
drivers/watchdog/diag288_wdt.c
@@
-118,8
+118,6
@@
static int wdt_start(struct watchdog_device *dev)
if (test_and_set_bit(DIAG_WDOG_BUSY, &wdt_status))
return -EBUSY;
if (test_and_set_bit(DIAG_WDOG_BUSY, &wdt_status))
return -EBUSY;
- ret = -ENODEV;
-
if (MACHINE_IS_VM) {
ebc_cmd = kmalloc(MAX_CMDLEN, GFP_KERNEL);
if (!ebc_cmd) {
if (MACHINE_IS_VM) {
ebc_cmd = kmalloc(MAX_CMDLEN, GFP_KERNEL);
if (!ebc_cmd) {
@@
-167,8
+165,6
@@
static int wdt_ping(struct watchdog_device *dev)
int ret;
unsigned int func;
int ret;
unsigned int func;
- ret = -ENODEV;
-
if (MACHINE_IS_VM) {
ebc_cmd = kmalloc(MAX_CMDLEN, GFP_KERNEL);
if (!ebc_cmd)
if (MACHINE_IS_VM) {
ebc_cmd = kmalloc(MAX_CMDLEN, GFP_KERNEL);
if (!ebc_cmd)