ChangeSet 1.2231.1.229, 2005/03/28 20:19:59-08:00, [EMAIL PROTECTED]
[PATCH] dvb: frontends: kfree() cleanup
kfree(NULL) is safe (Kenneth Aafloy)
Signed-off-by: Johannes Stezenbach <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
bt8xx/dst.c | 2 +-
dvb-core/dvb_ca_en50221.c | 3 +--
dvb-core/dvb_frontend.c | 3 +--
dvb-core/dvbdev.c | 4 +---
frontends/at76c651.c | 2 +-
frontends/cx22700.c | 2 +-
frontends/cx22702.c | 2 +-
frontends/cx24110.c | 2 +-
frontends/dib3000mb.c | 3 +--
frontends/dib3000mc.c | 3 +--
frontends/dvb_dummy_fe.c | 2 +-
frontends/l64781.c | 2 +-
frontends/mt312.c | 3 +--
frontends/mt352.c | 2 +-
frontends/nxt2002.c | 2 +-
frontends/nxt6000.c | 2 +-
frontends/or51211.c | 2 +-
frontends/sp8870.c | 2 +-
frontends/sp887x.c | 2 +-
frontends/stv0297.c | 3 +--
frontends/stv0299.c | 2 +-
frontends/tda10021.c | 2 +-
frontends/tda1004x.c | 2 +-
frontends/tda8083.c | 2 +-
frontends/tda80xx.c | 2 +-
frontends/ves1820.c | 2 +-
frontends/ves1x93.c | 2 +-
ttusb-dec/ttusbdecfe.c | 4 ++--
28 files changed, 29 insertions(+), 37 deletions(-)
diff -Nru a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
--- a/drivers/media/dvb/bt8xx/dst.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/bt8xx/dst.c 2005-03-28 21:59:20 -08:00
@@ -998,7 +998,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2005-03-28 21:59:20
-08:00
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2005-03-28 21:59:20
-08:00
@@ -1733,8 +1733,7 @@
if (ca != NULL) {
if (ca->dvbdev != NULL)
dvb_unregister_device(ca->dvbdev);
- if (ca->slot_info != NULL)
- kfree(ca->slot_info);
+ kfree(ca->slot_info);
kfree(ca);
}
pubca->private = NULL;
diff -Nru a/drivers/media/dvb/dvb-core/dvb_frontend.c
b/drivers/media/dvb/dvb-core/dvb_frontend.c
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c 2005-03-28 21:59:20 -08:00
@@ -908,8 +908,7 @@
else
printk("dvb_frontend: Demodulator (%s) does not have a release
callback!\n", fe->ops->info.name);
/* fe is invalid now */
- if (fepriv)
- kfree(fepriv);
+ kfree(fepriv);
up (&frontend_mutex);
return 0;
}
diff -Nru a/drivers/media/dvb/dvb-core/dvbdev.c
b/drivers/media/dvb/dvb-core/dvbdev.c
--- a/drivers/media/dvb/dvb-core/dvbdev.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/dvb-core/dvbdev.c 2005-03-28 21:59:20 -08:00
@@ -396,9 +396,7 @@
}
out:
- if (mbuf)
- kfree(mbuf);
-
+ kfree(mbuf);
return err;
}
diff -Nru a/drivers/media/dvb/frontends/at76c651.c
b/drivers/media/dvb/frontends/at76c651.c
--- a/drivers/media/dvb/frontends/at76c651.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/at76c651.c 2005-03-28 21:59:20 -08:00
@@ -402,7 +402,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/cx22700.c
b/drivers/media/dvb/frontends/cx22700.c
--- a/drivers/media/dvb/frontends/cx22700.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/cx22700.c 2005-03-28 21:59:20 -08:00
@@ -392,7 +392,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/cx22702.c
b/drivers/media/dvb/frontends/cx22702.c
--- a/drivers/media/dvb/frontends/cx22702.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/cx22702.c 2005-03-28 21:59:20 -08:00
@@ -476,7 +476,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/cx24110.c
b/drivers/media/dvb/frontends/cx24110.c
--- a/drivers/media/dvb/frontends/cx24110.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/cx24110.c 2005-03-28 21:59:20 -08:00
@@ -581,7 +581,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/dib3000mb.c
b/drivers/media/dvb/frontends/dib3000mb.c
--- a/drivers/media/dvb/frontends/dib3000mb.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/dib3000mb.c 2005-03-28 21:59:20 -08:00
@@ -738,8 +738,7 @@
return &state->frontend;
error:
- if (state)
- kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/dib3000mc.c
b/drivers/media/dvb/frontends/dib3000mc.c
--- a/drivers/media/dvb/frontends/dib3000mc.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/dib3000mc.c 2005-03-28 21:59:20 -08:00
@@ -885,8 +885,7 @@
return &state->frontend;
error:
- if (state)
- kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/dvb_dummy_fe.c
b/drivers/media/dvb/frontends/dvb_dummy_fe.c
--- a/drivers/media/dvb/frontends/dvb_dummy_fe.c 2005-03-28 21:59:20
-08:00
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c 2005-03-28 21:59:20
-08:00
@@ -123,7 +123,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/l64781.c
b/drivers/media/dvb/frontends/l64781.c
--- a/drivers/media/dvb/frontends/l64781.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/l64781.c 2005-03-28 21:59:20 -08:00
@@ -559,7 +559,7 @@
error:
if (reg0x3e >= 0) l64781_writereg (state, 0x3e, reg0x3e); /* restore
reg 0x3e */
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/mt312.c
b/drivers/media/dvb/frontends/mt312.c
--- a/drivers/media/dvb/frontends/mt312.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/mt312.c 2005-03-28 21:59:20 -08:00
@@ -641,8 +641,7 @@
return &state->frontend;
error:
- if (state)
- kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/mt352.c
b/drivers/media/dvb/frontends/mt352.c
--- a/drivers/media/dvb/frontends/mt352.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/mt352.c 2005-03-28 21:59:20 -08:00
@@ -581,7 +581,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/nxt2002.c
b/drivers/media/dvb/frontends/nxt2002.c
--- a/drivers/media/dvb/frontends/nxt2002.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/nxt2002.c 2005-03-28 21:59:20 -08:00
@@ -661,7 +661,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/nxt6000.c
b/drivers/media/dvb/frontends/nxt6000.c
--- a/drivers/media/dvb/frontends/nxt6000.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/nxt6000.c 2005-03-28 21:59:20 -08:00
@@ -511,7 +511,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/or51211.c
b/drivers/media/dvb/frontends/or51211.c
--- a/drivers/media/dvb/frontends/or51211.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/or51211.c 2005-03-28 21:59:20 -08:00
@@ -588,7 +588,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/sp8870.c
b/drivers/media/dvb/frontends/sp8870.c
--- a/drivers/media/dvb/frontends/sp8870.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/sp8870.c 2005-03-28 21:59:20 -08:00
@@ -570,7 +570,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/sp887x.c
b/drivers/media/dvb/frontends/sp887x.c
--- a/drivers/media/dvb/frontends/sp887x.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/sp887x.c 2005-03-28 21:59:20 -08:00
@@ -564,7 +564,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/stv0297.c
b/drivers/media/dvb/frontends/stv0297.c
--- a/drivers/media/dvb/frontends/stv0297.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/stv0297.c 2005-03-28 21:59:20 -08:00
@@ -758,8 +758,7 @@
return &state->frontend;
error:
- if (state)
- kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/stv0299.c
b/drivers/media/dvb/frontends/stv0299.c
--- a/drivers/media/dvb/frontends/stv0299.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/stv0299.c 2005-03-28 21:59:20 -08:00
@@ -675,7 +675,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/tda10021.c
b/drivers/media/dvb/frontends/tda10021.c
--- a/drivers/media/dvb/frontends/tda10021.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/tda10021.c 2005-03-28 21:59:20 -08:00
@@ -420,7 +420,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/tda1004x.c
b/drivers/media/dvb/frontends/tda1004x.c
--- a/drivers/media/dvb/frontends/tda1004x.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/tda1004x.c 2005-03-28 21:59:20 -08:00
@@ -1097,7 +1097,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/tda8083.c
b/drivers/media/dvb/frontends/tda8083.c
--- a/drivers/media/dvb/frontends/tda8083.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/tda8083.c 2005-03-28 21:59:20 -08:00
@@ -405,7 +405,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/tda80xx.c
b/drivers/media/dvb/frontends/tda80xx.c
--- a/drivers/media/dvb/frontends/tda80xx.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/tda80xx.c 2005-03-28 21:59:20 -08:00
@@ -683,7 +683,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/ves1820.c
b/drivers/media/dvb/frontends/ves1820.c
--- a/drivers/media/dvb/frontends/ves1820.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/ves1820.c 2005-03-28 21:59:20 -08:00
@@ -404,7 +404,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/frontends/ves1x93.c
b/drivers/media/dvb/frontends/ves1x93.c
--- a/drivers/media/dvb/frontends/ves1x93.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/frontends/ves1x93.c 2005-03-28 21:59:20 -08:00
@@ -497,7 +497,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
diff -Nru a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
--- a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c 2005-03-28 21:59:20 -08:00
+++ b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c 2005-03-28 21:59:20 -08:00
@@ -169,7 +169,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
@@ -195,7 +195,7 @@
return &state->frontend;
error:
- if (state) kfree(state);
+ kfree(state);
return NULL;
}
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
